[oe-commits] Ed Bartosh : devtool: build-image: remove <image>.bbappend

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 82c6452ca953eb32e2919d9f9e64497a15212be5
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=82c6452ca953eb32e2919d9f9e64497a15212be5

Author: Ed Bartosh <ed.bartosh at linux.intel.com>
Date:   Sun Aug 30 18:41:38 2015 +0300

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.

Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>

---

 scripts/lib/devtool/build-image.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/lib/devtool/build-image.py b/scripts/lib/devtool/build-image.py
index 563563b..5bc8213 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):
     appendfile = os.path.join(config.workspace_path, 'appends',
                               '%s.bbappend' % image)
 
+    # remove <image>.bbapend to make sure setup_tinfoil doesn't
+    # breake because of it
+    if os.path.isfile(appendfile):
+        os.unlink(appendfile)
+
     recipes = _get_recipes(workspace, config)
     if recipes:
         with open(appendfile, 'w') as afile: