mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

native/nativesdk: Ensure DISTRO_FEATURES is determistic

Browse Source 
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.

(From OE-Core rev: 76391673754cf6a01d68eedbd4181e543fa2f427)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2017-06-12 11:03:55 +01:00
parent 545f976943
commit 437f9cdbaf
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/native.bbclass
+1 -1
View File
@@ -129,7 +129,7 @@ python native_virtclass_handler () {
# from modifying native distro features # from modifying native distro features
features = set(d.getVar("DISTRO_FEATURES_NATIVE").split()) features = set(d.getVar("DISTRO_FEATURES_NATIVE").split())
filtered = set(bb.utils.filter("DISTRO_FEATURES", d.getVar("DISTRO_FEATURES_FILTER_NATIVE"), d).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 "" classextend = e.data.getVar('BBCLASSEXTEND') or ""
if "native" not in classextend: if "native" not in classextend:
meta/classes/nativesdk.bbclass
+1 -1
View File
@@ -74,7 +74,7 @@ python nativesdk_virtclass_handler () {
# from modifying nativesdk distro features # from modifying nativesdk distro features
features = set(d.getVar("DISTRO_FEATURES_NATIVESDK").split()) features = set(d.getVar("DISTRO_FEATURES_NATIVESDK").split())
filtered = set(bb.utils.filter("DISTRO_FEATURES", d.getVar("DISTRO_FEATURES_FILTER_NATIVESDK"), d).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("MLPREFIX", "nativesdk-")
e.data.setVar("PN", "nativesdk-" + e.data.getVar("PN").replace("-nativesdk", "").replace("nativesdk-", "")) e.data.setVar("PN", "nativesdk-" + e.data.getVar("PN").replace("-nativesdk", "").replace("nativesdk-", ""))