aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2017-01-05 16:17:27 +0100
committerPatrick Ohly <patrick.ohly@intel.com>2017-01-05 16:17:27 +0100
commit531a8e636ca891c34f2596eb7f6365a11d4b29a7 (patch)
tree45af5b03319c8cb2f2861976ef78730f18b27fba
parent07ad71b789d732f50e66e86c38c2870f98da81a7 (diff)
downloadmeta-swupd-531a8e636ca891c34f2596eb7f6365a11d4b29a7.tar.gz
meta-swupd-531a8e636ca891c34f2596eb7f6365a11d4b29a7.tar.bz2
meta-swupd-531a8e636ca891c34f2596eb7f6365a11d4b29a7.zip
bundles.py: fix "no bundles" special case
The recent enhancements broke the case where meta-swupd is only used as update mechanism, without any additional bundles installed. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
-rw-r--r--lib/swupd/bundles.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/swupd/bundles.py b/lib/swupd/bundles.py
index 75321f1..18400b8 100644
--- a/lib/swupd/bundles.py
+++ b/lib/swupd/bundles.py
@@ -77,10 +77,12 @@ def copy_core_contents(d):
# directly with the rootfs of the main image recipe.
havebundles = (d.getVar('SWUPD_BUNDLES', True) or '') != ''
if not havebundles:
+ manifest_files = []
for suffix in (contentsuffix, imagesuffix):
shutil.copy2(corefile + suffix, fullfile + suffix)
- bb.debug(1, "Copying from image rootfs (%s) to full bundle (%s)" % (imgrootfs, bundle))
- swupd.path.copyxattrfiles(d, manifest_files, imgrootfs, bundle, True)
+ manifest_files.extend(swupd.utils.manifest_to_file_list(fullfile + suffix))
+ bb.debug(1, "Copying from image rootfs (%s) to full bundle (%s)" % (rootfs, bundle))
+ swupd.path.copyxattrfiles(d, manifest_files, rootfs, bundle, True)
else:
mega_rootfs = d.getVar('MEGA_IMAGE_ROOTFS', True)
mega_archive = d.getVar('MEGA_IMAGE_ARCHIVE', True)