summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-09-08 11:39:13 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-09 14:25:06 +0100
commit4801b64243e57e554a593f0857dd53621d8f52e5 (patch)
tree34f05b37dfe42c4252af7b22f6a68af2770676a0
parent9b9733b7d74032aef4979bec553019421e77da14 (diff)
downloadopenembedded-core-contrib-4801b64243e57e554a593f0857dd53621d8f52e5.tar.gz
openembedded-core-contrib-4801b64243e57e554a593f0857dd53621d8f52e5.tar.bz2
openembedded-core-contrib-4801b64243e57e554a593f0857dd53621d8f52e5.zip
devtool: update-recipe: add a warning when recipe is inside the workspace
If a recipe has been added to the workspace via "devtool add" or "devtool upgrade" then the recipe file itself will be in the workspace layer; if you run "devtool update-recipe" particularly in the upgrade case you might think it would apply the upgrade to the original recipe, but it will not - in order to remain consistent it has to update the recipe that's in use which is the one in the workspace. Warn the user in this situation so that they know what they need to do when they are finished. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/devtool/standard.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index f76c632e78..4702491fe0 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -815,6 +815,10 @@ def update_recipe(args, config, basepath, workspace):
else:
raise DevtoolError('update_recipe: invalid mode %s' % mode)
+ rf = rd.getVar('FILE', True)
+ if rf.startswith(config.workspace_path):
+ logger.warn('Recipe file %s has been updated but is inside the workspace - you will need to move it (and any associated files next to it) out to the desired layer before using "devtool reset" in order to keep any changes' % rf)
+
return 0