diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-01 14:23:59 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-01 14:25:18 +0000 |
| commit | 8c405c97430ac830837e25438e8795f6f7abbdaa (patch) | |
| tree | 6081ded37e4c92836c23707deb30955061381ea3 | |
| parent | 6567ad6181f9e39812097f0154647e4b38238fdd (diff) | |
| download | bitbake-8c405c97430ac830837e25438e8795f6f7abbdaa.tar.gz | |
cookerdata: Fix cache/reparsing issue
When setting the LAYERSERIES_COMPAT and LAYERSERIES_CORENAMES variables,
we need to be deterministic. The random ordering from the sets was causing
unexpected reparses.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/cookerdata.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py index b4e0c4216..8198f509e 100644 --- a/lib/bb/cookerdata.py +++ b/lib/bb/cookerdata.py @@ -425,7 +425,7 @@ class CookerDataBuilder(object): data.delVar('LAYERDIR_RE') data.delVar('LAYERDIR') 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() collections = (data.getVar('BBFILE_COLLECTIONS') or "").split() @@ -461,7 +461,7 @@ class CookerDataBuilder(object): 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)) - data.setVar("LAYERSERIES_CORENAMES", " ".join(layerseries)) + data.setVar("LAYERSERIES_CORENAMES", " ".join(sorted(layerseries))) if not data.getVar("BBPATH"): msg = "The BBPATH variable is not set" |