From 66b7dfb73d19f2985f5d755fa30b5a15cbd5b7df Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 25 Aug 2015 17:57:37 +0100 Subject: 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 --- 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 398ceeeb28..d2fea4fcc2 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 a0fa62c28c..4dd7a7e5c9 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 8fd068525b..264438b442 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, -- cgit v1.2.3-54-g00ecf