diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-12 11:03:55 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-12 15:04:12 +0100 |
commit | 76391673754cf6a01d68eedbd4181e543fa2f427 (patch) | |
tree | be6cfb67712fe5a5ece0fc9690d06c368065599a /meta/classes/nativesdk.bbclass | |
parent | 6fd63e24a1c6ac901edb393c9db8e245189a83e2 (diff) | |
download | openembedded-core-contrib-76391673754cf6a01d68eedbd4181e543fa2f427.tar.gz |
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>
Diffstat (limited to 'meta/classes/nativesdk.bbclass')
-rw-r--r-- | meta/classes/nativesdk.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
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-", "")) |