[PATCH] devtool: do not write md5sums into upgraded recipes

[PATCH] devtool: do not write md5sums into upgraded recipes

[Alexander Kanavin]

This will drop them md5sums from recipes that still have them,
and will not re-add them for recipes where they're already
removed.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 scripts/lib/devtool/upgrade.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index cb6dce378a..f962a71e41 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -391,12 +391,12 @@ def _create_new_recipe(newpv, md5, sha256, srcrev, srcbranch, srcsubdir_old, src
             newvalues['SRC_URI[%s.md5sum]' % name] = None
             newvalues['SRC_URI[%s.sha256sum]' % name] = None
 
-    if md5 and sha256:
+    if sha256:
         if addnames:
             nameprefix = '%s.' % addnames[0]
         else:
             nameprefix = ''
-        newvalues['SRC_URI[%smd5sum]' % nameprefix] = md5
+        newvalues['SRC_URI[%smd5sum]' % nameprefix] = None
         newvalues['SRC_URI[%ssha256sum]' % nameprefix] = sha256
 
     if srcsubdir_new != srcsubdir_old:
-- 
2.26.2

Re: [OE-core] [PATCH] devtool: do not write md5sums into upgraded recipes

[Richard Purdie]

On Tue, 2020-05-19 at 19:10 +0200, Alexander Kanavin wrote:
> This will drop them md5sums from recipes that still have them,
> and will not re-add them for recipes where they're already
> removed.
> 
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  scripts/lib/devtool/upgrade.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/lib/devtool/upgrade.py
> b/scripts/lib/devtool/upgrade.py
> index cb6dce378a..f962a71e41 100644
> --- a/scripts/lib/devtool/upgrade.py
> +++ b/scripts/lib/devtool/upgrade.py
> @@ -391,12 +391,12 @@ def _create_new_recipe(newpv, md5, sha256,
> srcrev, srcbranch, srcsubdir_old, src
>              newvalues['SRC_URI[%s.md5sum]' % name] = None
>              newvalues['SRC_URI[%s.sha256sum]' % name] = None
>  
> -    if md5 and sha256:
> +    if sha256:
>          if addnames:
>              nameprefix = '%s.' % addnames[0]
>          else:
>              nameprefix = ''
> -        newvalues['SRC_URI[%smd5sum]' % nameprefix] = md5
> +        newvalues['SRC_URI[%smd5sum]' % nameprefix] = None
>          newvalues['SRC_URI[%ssha256sum]' % nameprefix] = sha256
>  
>      if srcsubdir_new != srcsubdir_old:

This broke the devtool selftests but I added a fix to the change before
merging.

Cheers,

Richard