diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-01 17:11:07 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-08 11:15:47 +0000 |
commit | 4d19594b8bdacde6d809d3f2a25cff7c5a42295e (patch) | |
tree | 21396fcd2514f14ac4db34e1db7ab5d85d76d822 /meta/lib/oeqa/utils/commands.py | |
parent | 4901c9d471cab99d52876842980222ce271b66e4 (diff) | |
download | poky-4d19594b8bdacde6d809d3f2a25cff7c5a42295e.tar.gz |
devtool/friends: Use LAYERSERIES_CORENAMES when generating LAYERSERIES_COMPAT entries4.2_M1
It seems some layers want to subvert the intent of LAYERSERIES_COMPAT
so bitbake is going to have to become stricter about the values there.
To work with this, use LAYERSERIES_CORENAMES to generate the entries in
LAYERSERIES_COMPAT instead of the current magic LAYERSERIES_COMPAT_core
value which may not continue to work.
The downside to this is when migating between releases, people would
need to update devtool workspace layer.conf files. I guess you could
argue this is a feature!
(From OE-Core rev: 96ff9baa8ead57504f40f362ed3a4aaa776d1b58)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/utils/commands.py')
-rw-r--r-- | meta/lib/oeqa/utils/commands.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py index f733fcdf3c..f4daea2507 100644 --- a/meta/lib/oeqa/utils/commands.py +++ b/meta/lib/oeqa/utils/commands.py | |||
@@ -300,6 +300,7 @@ def get_test_layer(): | |||
300 | 300 | ||
301 | def create_temp_layer(templayerdir, templayername, priority=999, recipepathspec='recipes-*/*'): | 301 | def create_temp_layer(templayerdir, templayername, priority=999, recipepathspec='recipes-*/*'): |
302 | os.makedirs(os.path.join(templayerdir, 'conf')) | 302 | os.makedirs(os.path.join(templayerdir, 'conf')) |
303 | corenames = get_bb_var('LAYERSERIES_CORENAMES') | ||
303 | with open(os.path.join(templayerdir, 'conf', 'layer.conf'), 'w') as f: | 304 | with open(os.path.join(templayerdir, 'conf', 'layer.conf'), 'w') as f: |
304 | f.write('BBPATH .= ":${LAYERDIR}"\n') | 305 | f.write('BBPATH .= ":${LAYERDIR}"\n') |
305 | f.write('BBFILES += "${LAYERDIR}/%s/*.bb \\' % recipepathspec) | 306 | f.write('BBFILES += "${LAYERDIR}/%s/*.bb \\' % recipepathspec) |
@@ -308,7 +309,7 @@ def create_temp_layer(templayerdir, templayername, priority=999, recipepathspec= | |||
308 | f.write('BBFILE_PATTERN_%s = "^${LAYERDIR}/"\n' % templayername) | 309 | f.write('BBFILE_PATTERN_%s = "^${LAYERDIR}/"\n' % templayername) |
309 | f.write('BBFILE_PRIORITY_%s = "%d"\n' % (templayername, priority)) | 310 | f.write('BBFILE_PRIORITY_%s = "%d"\n' % (templayername, priority)) |
310 | f.write('BBFILE_PATTERN_IGNORE_EMPTY_%s = "1"\n' % templayername) | 311 | f.write('BBFILE_PATTERN_IGNORE_EMPTY_%s = "1"\n' % templayername) |
311 | f.write('LAYERSERIES_COMPAT_%s = "${LAYERSERIES_COMPAT_core}"\n' % templayername) | 312 | f.write('LAYERSERIES_COMPAT_%s = "%s"\n' % (templayername, corenames)) |
312 | 313 | ||
313 | @contextlib.contextmanager | 314 | @contextlib.contextmanager |
314 | def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None, qemuparams=None, overrides={}, discard_writes=True): | 315 | def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None, qemuparams=None, overrides={}, discard_writes=True): |