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:20 +0000 |
commit | cd5aab07cd97e694d6d3dd3441ffe1144b963564 (patch) | |
tree | 2a91710947707676ddad68562172683f50dcb8c1 /bitbake | |
parent | c9c2b6b613bbaf7133d9c3435f3aef3fe4e38f59 (diff) | |
download | poky-cd5aab07cd97e694d6d3dd3441ffe1144b963564.tar.gz |
bitbake: 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.
(Bitbake rev: 8c405c97430ac830837e25438e8795f6f7abbdaa)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/cookerdata.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py index b4e0c4216b..8198f509e2 100644 --- a/bitbake/lib/bb/cookerdata.py +++ b/bitbake/lib/bb/cookerdata.py | |||
@@ -425,7 +425,7 @@ class CookerDataBuilder(object): | |||
425 | data.delVar('LAYERDIR_RE') | 425 | data.delVar('LAYERDIR_RE') |
426 | data.delVar('LAYERDIR') | 426 | data.delVar('LAYERDIR') |
427 | for c in compat_entries: | 427 | for c in compat_entries: |
428 | data.setVar("LAYERSERIES_COMPAT_%s" % c, compat_entries[c]) | 428 | data.setVar("LAYERSERIES_COMPAT_%s" % c, sorted(compat_entries[c])) |
429 | 429 | ||
430 | bbfiles_dynamic = (data.getVar('BBFILES_DYNAMIC') or "").split() | 430 | bbfiles_dynamic = (data.getVar('BBFILES_DYNAMIC') or "").split() |
431 | collections = (data.getVar('BBFILE_COLLECTIONS') or "").split() | 431 | collections = (data.getVar('BBFILE_COLLECTIONS') or "").split() |
@@ -461,7 +461,7 @@ class CookerDataBuilder(object): | |||
461 | elif not compat and not data.getVar("BB_WORKERCONTEXT"): | 461 | elif not compat and not data.getVar("BB_WORKERCONTEXT"): |
462 | 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)) | 462 | 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)) |
463 | 463 | ||
464 | data.setVar("LAYERSERIES_CORENAMES", " ".join(layerseries)) | 464 | data.setVar("LAYERSERIES_CORENAMES", " ".join(sorted(layerseries))) |
465 | 465 | ||
466 | if not data.getVar("BBPATH"): | 466 | if not data.getVar("BBPATH"): |
467 | msg = "The BBPATH variable is not set" | 467 | msg = "The BBPATH variable is not set" |