summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-25 17:57:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-30 12:36:01 +0100
commit66b7dfb73d19f2985f5d755fa30b5a15cbd5b7df (patch)
tree73b627b39b0e264a66a2959a7fb88f5c74a8aee9 /meta/classes
parentd1052050bd6594d1d0e8dc1c8edce4866cc669e1 (diff)
downloadpoky-66b7dfb73d19f2985f5d755fa30b5a15cbd5b7df.tar.gz
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. (From OE-Core rev: 5826a9260138c437f87ba1a9f84d5c08442b997d) (From OE-Core rev: 59ccabdfb59a3e0917585dafab7a1e7c71330996) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package_deb.bbclass3
-rw-r--r--meta/classes/package_ipk.bbclass2
-rw-r--r--meta/classes/package_rpm.bbclass2
3 files changed, 7 insertions, 0 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 398ceeeb28..d2fea4fcc2 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -288,6 +288,9 @@ python do_package_deb () {
288 cleanupcontrol(root) 288 cleanupcontrol(root)
289 bb.utils.unlockfile(lf) 289 bb.utils.unlockfile(lf)
290} 290}
291# Otherwise allarch packages may change depending on override configuration
292do_package_deb[vardepsexclude] = "OVERRIDES"
293
291 294
292SSTATETASKS += "do_package_write_deb" 295SSTATETASKS += "do_package_write_deb"
293do_package_write_deb[sstate-inputdirs] = "${PKGWRITEDIRDEB}" 296do_package_write_deb[sstate-inputdirs] = "${PKGWRITEDIRDEB}"
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index a0fa62c28c..4dd7a7e5c9 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -250,6 +250,8 @@ python do_package_ipk () {
250 bb.utils.unlockfile(lf) 250 bb.utils.unlockfile(lf)
251 251
252} 252}
253# Otherwise allarch packages may change depending on override configuration
254do_package_ipk[vardepsexclude] = "OVERRIDES"
253 255
254SSTATETASKS += "do_package_write_ipk" 256SSTATETASKS += "do_package_write_ipk"
255do_package_write_ipk[sstate-inputdirs] = "${PKGWRITEDIRIPK}" 257do_package_write_ipk[sstate-inputdirs] = "${PKGWRITEDIRIPK}"
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 8fd068525b..264438b442 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -645,6 +645,8 @@ python write_specfile () {
645 645
646 specfile.close() 646 specfile.close()
647} 647}
648# Otherwise allarch packages may change depending on override configuration
649write_specfile[vardepsexclude] = "OVERRIDES"
648 650
649python do_package_rpm () { 651python do_package_rpm () {
650 # We need a simple way to remove the MLPREFIX from the package name, 652 # We need a simple way to remove the MLPREFIX from the package name,