aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Draszik <git@andred.net>2017-02-16 14:58:30 +0000
committerPatrick Ohly <patrick.ohly@intel.com>2017-02-17 08:41:07 +0100
commit58ac26345b132110b0475c75c3875f92666b37ec (patch)
tree45f23c40c58c6cd4eddf9805a213905db80a71cb
parentafaba11d8009de40fcf38bd241ff8740b3a3a386 (diff)
downloadmeta-swupd-58ac26345b132110b0475c75c3875f92666b37ec.tar.gz
meta-swupd-58ac26345b132110b0475c75c3875f92666b37ec.tar.bz2
meta-swupd-58ac26345b132110b0475c75c3875f92666b37ec.zip
bundles.py: fix copying of full image to full bundle when no SWUPD_BUNDLES
When SWUPD_BUNDLES is not set, exceptions are thrown, stopping the build - there are two issues in here: - the debug statement references a non-existent variable, 'bundle' was renamed to fulltar - copyxattrfiles() needs a list of files as 2nd argument, not a filename of a file which contains this list This got broken in commit 6c097131ad39 ("meta-swupd: support rm_work.bbclass") while support for rm_work was being added. Signed-off-by: André Draszik <git@andred.net>
-rw-r--r--lib/swupd/bundles.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/swupd/bundles.py b/lib/swupd/bundles.py
index 24947a8..b4c6f49 100644
--- a/lib/swupd/bundles.py
+++ b/lib/swupd/bundles.py
@@ -72,8 +72,9 @@ def copy_core_contents(d):
if not havebundles:
rootfs = d.getVar('IMAGE_ROOTFS', True)
workdir = d.getVar('WORKDIR', True)
- bb.debug(1, "Copying from image rootfs (%s) to full bundle (%s)" % (rootfs, bundle))
- swupd.path.copyxattrfiles(d, source + contentsuffix, rootfs, fulltar, True)
+ bb.debug(1, "Copying from image rootfs (%s) to full bundle (%s)" % (rootfs, fulltar))
+ swupd.path.copyxattrfiles(d, swupd.utils.manifest_to_file_list(source + contentsuffix),
+ rootfs, fulltar, True)
else:
mega_archive = d.getVar('MEGA_IMAGE_ARCHIVE', True)
if os.path.exists(fulltar):