aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-12 11:03:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-12 15:04:12 +0100
commit76391673754cf6a01d68eedbd4181e543fa2f427 (patch)
treebe6cfb67712fe5a5ece0fc9690d06c368065599a
parent6fd63e24a1c6ac901edb393c9db8e245189a83e2 (diff)
downloadopenembedded-core-contrib-76391673754cf6a01d68eedbd4181e543fa2f427.tar.gz
openembedded-core-contrib-76391673754cf6a01d68eedbd4181e543fa2f427.tar.bz2
openembedded-core-contrib-76391673754cf6a01d68eedbd4181e543fa2f427.zip
native/nativesdk: Ensure DISTRO_FEATURES is determistic
set() order is random and hence the filtered native/nativesdk DISTRO_FEATURES could be set to random ordering. We've been lucky so far this tended not to cause issues but some queued changes highedlighted this. Thrown in a sorted() so the order is deterministic and we get consistent hash checksums between runs and between machines. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/native.bbclass2
-rw-r--r--meta/classes/nativesdk.bbclass2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index b8f839a8b2..6b7f3dd76e 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -129,7 +129,7 @@ python native_virtclass_handler () {
# from modifying native distro features
features = set(d.getVar("DISTRO_FEATURES_NATIVE").split())
filtered = set(bb.utils.filter("DISTRO_FEATURES", d.getVar("DISTRO_FEATURES_FILTER_NATIVE"), d).split())
- d.setVar("DISTRO_FEATURES", " ".join(features | filtered))
+ d.setVar("DISTRO_FEATURES", " ".join(sorted(features | filtered)))
classextend = e.data.getVar('BBCLASSEXTEND') or ""
if "native" not in classextend:
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index 655b4560e7..69fb45c8a5 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -74,7 +74,7 @@ python nativesdk_virtclass_handler () {
# from modifying nativesdk distro features
features = set(d.getVar("DISTRO_FEATURES_NATIVESDK").split())
filtered = set(bb.utils.filter("DISTRO_FEATURES", d.getVar("DISTRO_FEATURES_FILTER_NATIVESDK"), d).split())
- d.setVar("DISTRO_FEATURES", " ".join(features | filtered))
+ d.setVar("DISTRO_FEATURES", " ".join(sorted(features | filtered)))
e.data.setVar("MLPREFIX", "nativesdk-")
e.data.setVar("PN", "nativesdk-" + e.data.getVar("PN").replace("-nativesdk", "").replace("nativesdk-", ""))