diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-10-31 16:59:46 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-07 11:04:22 +0000 |
commit | e0944011e699d32b42afd2f9ff03c6f72082121b (patch) | |
tree | 667d3510e91755887eb2a9f31bf45f1654400338 | |
parent | 09754b41199f042dfd6937e1c4525fc320cb8684 (diff) | |
download | poky-e0944011e699d32b42afd2f9ff03c6f72082121b.tar.gz |
devtool: finish: warn if moving recipe to unconfigured destination layer
If you run devtool finish to move a recipe created in the workspace by
devtool add or devtool upgrade to a layer, and that layer is not
currently included in bblayers.conf (perhaps unintentionally), then the
recipe will no longer be visible to bitbake. In this scenario, show a
warning so that the user isn't surprised by the recipe "going missing".
(From OE-Core rev: 4da8a58e2997db4f24ae0cac0ba27259d7857a05)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | scripts/lib/devtool/standard.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 9511d5618c..c15bfef9d8 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -1517,6 +1517,11 @@ def finish(args, config, basepath, workspace): | |||
1517 | destpath = oe.recipeutils.get_bbfile_path(rd, destlayerdir, origrelpath) | 1517 | destpath = oe.recipeutils.get_bbfile_path(rd, destlayerdir, origrelpath) |
1518 | if not destpath: | 1518 | if not destpath: |
1519 | raise DevtoolError("Unable to determine destination layer path - check that %s specifies an actual layer and %s/conf/layer.conf specifies BBFILES. You may also need to specify a more complete path." % (args.destination, destlayerdir)) | 1519 | raise DevtoolError("Unable to determine destination layer path - check that %s specifies an actual layer and %s/conf/layer.conf specifies BBFILES. You may also need to specify a more complete path." % (args.destination, destlayerdir)) |
1520 | # Warn if the layer isn't in bblayers.conf (the code to create a bbappend will do this in other cases) | ||
1521 | layerdirs = [os.path.abspath(layerdir) for layerdir in rd.getVar('BBLAYERS', True).split()] | ||
1522 | if not os.path.abspath(destlayerdir) in layerdirs: | ||
1523 | bb.warn('Specified destination layer is not currently enabled in bblayers.conf, so the %s recipe will now be unavailable in your current configuration until you add the layer there' % args.recipename) | ||
1524 | |||
1520 | elif destlayerdir == origlayerdir: | 1525 | elif destlayerdir == origlayerdir: |
1521 | # Same layer, update the original recipe | 1526 | # Same layer, update the original recipe |
1522 | appendlayerdir = None | 1527 | appendlayerdir = None |