package_*.bbclass: Ensure OVERRIDES doesn't change sstate signature

PATCH New Richard Purdie 1 participant 1 message Aug 25, 2015

Share & tools

Richard Purdie

author

2015-08-25 16:57 UTC #0 lore raw

PATCH 1/1 package_*.bbclass: Ensure OVERRIDES doesn't change sstate signature

Changes to OVERRIDES (e.g. from changing MACHINE) should not change the sstate signatures of do_package_write_*. Exclude the variable explicitly in the package classes to avoid this.

Signed-off-by Richard Purdie <[email protected]>

meta/classes/package_deb.bbclass +3 -0

index 398ceee..d2fea4f 100644
@@ -288,6 +288,9 @@ python do_package_deb () {
         cleanupcontrol(root)
         bb.utils.unlockfile(lf)
 }
+# Otherwise allarch packages may change depending on override configuration
+do_package_deb[vardepsexclude] = "OVERRIDES"
+
 
 SSTATETASKS += "do_package_write_deb"
 do_package_write_deb[sstate-inputdirs] = "${PKGWRITEDIRDEB}"

meta/classes/package_ipk.bbclass +2 -0

index a0fa62c..4dd7a7e 100644
@@ -250,6 +250,8 @@ python do_package_ipk () {
         bb.utils.unlockfile(lf)
 
 }
+# Otherwise allarch packages may change depending on override configuration
+do_package_ipk[vardepsexclude] = "OVERRIDES"
 
 SSTATETASKS += "do_package_write_ipk"
 do_package_write_ipk[sstate-inputdirs] = "${PKGWRITEDIRIPK}"

meta/classes/package_rpm.bbclass +2 -0

index 8fd0685..264438b 100644
@@ -645,6 +645,8 @@ python write_specfile () {
 
     specfile.close()
 }
+# Otherwise allarch packages may change depending on override configuration
+write_specfile[vardepsexclude] = "OVERRIDES"
 
 python do_package_rpm () {
     # We need a simple way to remove the MLPREFIX from the package name,