]> code.ossystems Code Review - openembedded-core.git/commitdiff
devtool: build-image: remove <image>.bbappend
authorEd Bartosh <ed.bartosh@linux.intel.com>
Sun, 30 Aug 2015 15:41:38 +0000 (18:41 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 31 Aug 2015 10:36:57 +0000 (11:36 +0100)
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@linux.intel.com>
scripts/lib/devtool/build-image.py

index 563563b3e76251e712920ed5d5525f6fa4c398bc..5bc82134c19da6e908310bff54a7404add9ccf89 100644 (file)
@@ -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: