[PATCH] siggen.py: If both sigs have a variable in it's whitelist then don't say it's changed

[PATCH] siggen.py: If both sigs have a variable in it's whitelist then don't say it's changed

[Matthew McClintock]

Some BB_HASHBASE_WHITELIST variables are in the lists of variable
dependencies for signatures. Ignore those differences in lists
since this difference does not matter

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
I'm seeing variables in BB_HASHBASE_WHITELIST make it
to the signature. Not sure if they are used to calculate
the hash but assuming they are not we don't need to print
out that they are different

 lib/bb/siggen.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
index 9231291..bb909ba 100644
--- a/lib/bb/siggen.py
+++ b/lib/bb/siggen.py
@@ -237,13 +237,13 @@ def compare_sigfiles(a, b):
     p2 = pickle.Unpickler(file(b, "rb"))
     b_data = p2.load()
 
-    def dict_diff(a, b):
+    def dict_diff(a, b, whitelist=set()):
         sa = set(a.keys())
         sb = set(b.keys())
         common = sa & sb
         changed = set()
         for i in common:
-            if a[i] != b[i]:
+            if a[i] != b[i] and i not in whitelist:
                 changed.add(i)
         added = sa - sb
         removed = sb - sa
@@ -263,7 +263,7 @@ def compare_sigfiles(a, b):
     if a_data['basehash'] != b_data['basehash']:
         print "basehash changed from %s to %s" % (a_data['basehash'], b_data['basehash'])
 
-    changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps'])
+    changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps'], a_data['basewhitelist'] & b_data['basewhitelist'])
     if changed:
         for dep in changed:
             print "List of dependencies for variable %s changed from %s to %s" % (dep, a_data['gendeps'][dep], b_data['gendeps'][dep])
-- 
1.7.6.1

Re: [PATCH] siggen.py: If both sigs have a variable in it's whitelist then don't say it's changed

[Richard Purdie]

On Wed, 2011-11-30 at 11:24 -0600, Matthew McClintock wrote:
> Some BB_HASHBASE_WHITELIST variables are in the lists of variable
> dependencies for signatures. Ignore those differences in lists
> since this difference does not matter
> 
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
> I'm seeing variables in BB_HASHBASE_WHITELIST make it
> to the signature. Not sure if they are used to calculate
> the hash but assuming they are not we don't need to print
> out that they are different
> 
>  lib/bb/siggen.py |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)

Merged to master, thanks.

Richard

[PATCH] image_types.bbclass: add xz-native to deps for lzma ext2.lzma images

[Matthew McClintock]

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 meta/classes/image_types.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 2260915..aed5a85 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -142,7 +142,7 @@ IMAGE_DEPENDS_cramfs = "cramfs-native"
 IMAGE_DEPENDS_ext2 = "genext2fs-native"
 IMAGE_DEPENDS_ext2.gz = "genext2fs-native"
 IMAGE_DEPENDS_ext2.bz2 = "genext2fs-native"
-IMAGE_DEPENDS_ext2.lzma = "genext2fs-native"
+IMAGE_DEPENDS_ext2.lzma = "genext2fs-native xz-native"
 IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native"
 IMAGE_DEPENDS_ext3.gz = "genext2fs-native e2fsprogs-native"
 IMAGE_DEPENDS_ext4 = "genext2fs-native e2fsprogs-native"
-- 
1.7.6.1

[PATCH] siggen.py: If both sigs have a variable in it's whitelist then don't say it's changed

[Matthew McClintock]

Some BB_HASHBASE_WHITELIST variables are in the lists of variable
dependencies for signatures. Ignore those differences in lists
since this difference does not matter

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
I'm seeing variables in BB_HASHBASE_WHITELIST make it
to the signature. Not sure if they are used to calculate
the hash but assuming they are not we don't need to print
out that they are different

 bitbake/lib/bb/siggen.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 9231291..bb909ba 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -237,13 +237,13 @@ def compare_sigfiles(a, b):
     p2 = pickle.Unpickler(file(b, "rb"))
     b_data = p2.load()
 
-    def dict_diff(a, b):
+    def dict_diff(a, b, whitelist=set()):
         sa = set(a.keys())
         sb = set(b.keys())
         common = sa & sb
         changed = set()
         for i in common:
-            if a[i] != b[i]:
+            if a[i] != b[i] and i not in whitelist:
                 changed.add(i)
         added = sa - sb
         removed = sb - sa
@@ -263,7 +263,7 @@ def compare_sigfiles(a, b):
     if a_data['basehash'] != b_data['basehash']:
         print "basehash changed from %s to %s" % (a_data['basehash'], b_data['basehash'])
 
-    changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps'])
+    changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps'], a_data['basewhitelist'] & b_data['basewhitelist'])
     if changed:
         for dep in changed:
             print "List of dependencies for variable %s changed from %s to %s" % (dep, a_data['gendeps'][dep], b_data['gendeps'][dep])
-- 
1.7.6.1

Re: [PATCH] siggen.py: If both sigs have a variable in it's whitelist then don't say it's changed

[McClintock Matthew-B29882]

On Wed, Nov 30, 2011 at 1:55 AM, Matthew McClintock <msm@freescale.com> wrote:
> Some BB_HASHBASE_WHITELIST variables are in the lists of variable
> dependencies for signatures. Ignore those differences in lists
> since this difference does not matter
>
> Signed-off-by: Matthew McClintock <msm@freescale.com>

Sent this to bitbake mailing list where it belongs.

-M