summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-08-30 18:41:38 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-31 11:37:14 +0100
commit2dac49db87291589489cdc54420dfead89a5a343 (patch)
tree2a5c50a55c1e0f1d6824492d99ef72442a4c7b6b /scripts/lib
parent96726242f006dc29a3ad84276ce8f1c35147dee6 (diff)
downloadpoky-2dac49db87291589489cdc54420dfead89a5a343.tar.gz
devtool: build-image: remove <image>.bbappend
Removed <image>.bbappend before generating it again as it may cause tinfoil to fail due to its wrong content. It's safe to do as <image>.bbappend is regenerated anyway. (From OE-Core rev: 82c6452ca953eb32e2919d9f9e64497a15212be5) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/devtool/build-image.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/lib/devtool/build-image.py b/scripts/lib/devtool/build-image.py
index 563563b3e7..5bc82134c1 100644
--- a/scripts/lib/devtool/build-image.py
+++ b/scripts/lib/devtool/build-image.py
@@ -50,6 +50,11 @@ def build_image(args, config, basepath, workspace):
50 appendfile = os.path.join(config.workspace_path, 'appends', 50 appendfile = os.path.join(config.workspace_path, 'appends',
51 '%s.bbappend' % image) 51 '%s.bbappend' % image)
52 52
53 # remove <image>.bbapend to make sure setup_tinfoil doesn't
54 # breake because of it
55 if os.path.isfile(appendfile):
56 os.unlink(appendfile)
57
53 recipes = _get_recipes(workspace, config) 58 recipes = _get_recipes(workspace, config)
54 if recipes: 59 if recipes:
55 with open(appendfile, 'w') as afile: 60 with open(appendfile, 'w') as afile: