diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-07 11:32:03 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-07 11:44:50 +0100 |
commit | 1e1991ae65a96fd865921933f89e5e2e3477550d (patch) | |
tree | 29a984426763ae5c7dd71422140b33de9f4f0815 | |
parent | 7b0074b79b75fad0cd511fded50aafc60c2dfec5 (diff) | |
download | poky-1e1991ae65a96fd865921933f89e5e2e3477550d.tar.gz |
devtool/oeqa: Ensure added layers set LAYERSERIES_COMPAT
Now that we see warnings if LAYERSERIES_COMPAT is unset, the auto generated
code from devtool/oeqa needs to set this to avoid warnings which break
various tests.
(From OE-Core rev: 27568410ebb0d40db3428550704f35199df0e034)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oeqa/utils/commands.py | 2 | ||||
-rwxr-xr-x | scripts/devtool | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py index cad0bea0be..0d9cf23fe4 100644 --- a/meta/lib/oeqa/utils/commands.py +++ b/meta/lib/oeqa/utils/commands.py | |||
@@ -285,7 +285,7 @@ def create_temp_layer(templayerdir, templayername, priority=999, recipepathspec= | |||
285 | f.write('BBFILE_PATTERN_%s = "^${LAYERDIR}/"\n' % templayername) | 285 | f.write('BBFILE_PATTERN_%s = "^${LAYERDIR}/"\n' % templayername) |
286 | f.write('BBFILE_PRIORITY_%s = "%d"\n' % (templayername, priority)) | 286 | f.write('BBFILE_PRIORITY_%s = "%d"\n' % (templayername, priority)) |
287 | f.write('BBFILE_PATTERN_IGNORE_EMPTY_%s = "1"\n' % templayername) | 287 | f.write('BBFILE_PATTERN_IGNORE_EMPTY_%s = "1"\n' % templayername) |
288 | 288 | f.write('LAYERSERIES_COMPAT_%s = "${LAYERSERIES_COMPAT_core}"\n' % templayername) | |
289 | 289 | ||
290 | @contextlib.contextmanager | 290 | @contextlib.contextmanager |
291 | def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None, qemuparams=None, overrides={}, discard_writes=True): | 291 | def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None, qemuparams=None, overrides={}, discard_writes=True): |
diff --git a/scripts/devtool b/scripts/devtool index b4bfbb8329..d681a1929a 100755 --- a/scripts/devtool +++ b/scripts/devtool | |||
@@ -165,6 +165,7 @@ def _create_workspace(workspacedir, config, basepath): | |||
165 | f.write('BBFILE_PATTERN_workspacelayer = "^$' + '{LAYERDIR}/"\n') | 165 | f.write('BBFILE_PATTERN_workspacelayer = "^$' + '{LAYERDIR}/"\n') |
166 | f.write('BBFILE_PATTERN_IGNORE_EMPTY_workspacelayer = "1"\n') | 166 | f.write('BBFILE_PATTERN_IGNORE_EMPTY_workspacelayer = "1"\n') |
167 | f.write('BBFILE_PRIORITY_workspacelayer = "99"\n') | 167 | f.write('BBFILE_PRIORITY_workspacelayer = "99"\n') |
168 | f.write('LAYERSERIES_COMPAT_workspacelayer = "${LAYERSERIES_COMPAT_core}"\n') | ||
168 | # Add a README file | 169 | # Add a README file |
169 | with open(os.path.join(workspacedir, 'README'), 'w') as f: | 170 | with open(os.path.join(workspacedir, 'README'), 'w') as f: |
170 | f.write('This layer was created by the OpenEmbedded devtool utility in order to\n') | 171 | f.write('This layer was created by the OpenEmbedded devtool utility in order to\n') |