mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: cookerdata: Fix cache/reparsing issue

Browse Source 
When setting the LAYERSERIES_COMPAT and LAYERSERIES_CORENAMES variables,
we need to be deterministic. The random ordering from the sets was causing
unexpected reparses.

(Bitbake rev: 8c405c97430ac830837e25438e8795f6f7abbdaa)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2023-01-01 14:23:59 +00:00
parent c9c2b6b613
commit cd5aab07cd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/cookerdata.py
+2 -2
View File
@@ -425,7 +425,7 @@ class CookerDataBuilder(object):
data.delVar('LAYERDIR_RE') data.delVar('LAYERDIR_RE')
data.delVar('LAYERDIR') data.delVar('LAYERDIR')
for c in compat_entries: for c in compat_entries:
data.setVar("LAYERSERIES_COMPAT_%s" % c, compat_entries[c]) data.setVar("LAYERSERIES_COMPAT_%s" % c, sorted(compat_entries[c]))
bbfiles_dynamic = (data.getVar('BBFILES_DYNAMIC') or "").split() bbfiles_dynamic = (data.getVar('BBFILES_DYNAMIC') or "").split()
collections = (data.getVar('BBFILE_COLLECTIONS') or "").split() collections = (data.getVar('BBFILE_COLLECTIONS') or "").split()
@@ -461,7 +461,7 @@ class CookerDataBuilder(object):
elif not compat and not data.getVar("BB_WORKERCONTEXT"): elif not compat and not data.getVar("BB_WORKERCONTEXT"):
bb.warn("Layer %s should set LAYERSERIES_COMPAT_%s in its conf/layer.conf file to list the core layer names it is compatible with." % (c, c)) bb.warn("Layer %s should set LAYERSERIES_COMPAT_%s in its conf/layer.conf file to list the core layer names it is compatible with." % (c, c))
data.setVar("LAYERSERIES_CORENAMES", " ".join(layerseries)) data.setVar("LAYERSERIES_CORENAMES", " ".join(sorted(layerseries)))
if not data.getVar("BBPATH"): if not data.getVar("BBPATH"):
msg = "The BBPATH variable is not set" msg = "The BBPATH variable is not set"