From 2dac49db87291589489cdc54420dfead89a5a343 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Sun, 30 Aug 2015 18:41:38 +0300 Subject: devtool: build-image: remove .bbappend Removed .bbappend before generating it again as it may cause tinfoil to fail due to its wrong content. It's safe to do as .bbappend is regenerated anyway. (From OE-Core rev: 82c6452ca953eb32e2919d9f9e64497a15212be5) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- scripts/lib/devtool/build-image.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'scripts/lib/devtool/build-image.py') 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): appendfile = os.path.join(config.workspace_path, 'appends', '%s.bbappend' % image) + # remove .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: -- cgit v1.2.3-54-g00ecf