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 <[email protected]>
---
lib/swupd/bundles.py | 5 +++--
1 file 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):
--
2.11.0
--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
