[oe-commits] Richard Purdie : package_*.bbclass: Ensure OVERRIDES doesn' t change sstate signature
git at git.openembedded.org
git at git.openembedded.org
Wed Aug 26 06:37:22 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: c2a9f9c7e1d7d47fe1cae1157c8ffda322c350d4
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c2a9f9c7e1d7d47fe1cae1157c8ffda322c350d4
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Tue Aug 25 17:57:37 2015 +0100
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 <richard.purdie at linuxfoundation.org>
---
meta/classes/package_deb.bbclass | 3 +++
meta/classes/package_ipk.bbclass | 2 ++
meta/classes/package_rpm.bbclass | 2 ++
3 files changed, 7 insertions(+)
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 398ceee..d2fea4f 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -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}"
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index a0fa62c..4dd7a7e 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -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}"
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 8fd0685..264438b 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -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,
More information about the Openembedded-commits
mailing list