summaryrefslogtreecommitdiffstats
path: root/scripts/lib
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:27:52 +0100
commit6d50a5e0ed443f17a152c3603a8cf5d6a1729477 (patch)
tree9271e5f8cfe9375b4b71e28fab024e974ab3abd0 /scripts/lib
parent3dd9fc39abdbccdbc313b577e7750974e3d6454e (diff)
downloadpoky-6d50a5e0ed443f17a152c3603a8cf5d6a1729477.tar.gz
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. (From OE-Core rev: 4801b64243e57e554a593f0857dd53621d8f52e5) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-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):
815 else: 815 else:
816 raise DevtoolError('update_recipe: invalid mode %s' % mode) 816 raise DevtoolError('update_recipe: invalid mode %s' % mode)
817 817
818 rf = rd.getVar('FILE', True)
819 if rf.startswith(config.workspace_path):
820 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)
821
818 return 0 822 return 0
819 823
820 824