From: "André Draszik" <git@andred.net>
To: yocto@yoctoproject.org
Subject: [meta-swupd][PATCH 3/3] bundles.py: fix copying of full image to full bundle when no SWUPD_BUNDLES
Date: Thu, 16 Feb 2017 14:58:30 +0000 [thread overview]
Message-ID: <20170216145830.21766-4-git@andred.net> (raw)
In-Reply-To: <20170216145830.21766-1-git@andred.net>
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>
---
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
next prev parent reply other threads:[~2017-02-16 14:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-16 14:58 [meta-swupd][PATCH 0/3] fixes for when SWUPD_BUNDLES is undefined André Draszik
2017-02-16 14:58 ` [meta-swupd][PATCH 1/3] swupd-image.bbclass: don't fail parsing if " André Draszik
2017-02-16 14:58 ` [meta-swupd][PATCH 2/3] path.py: always clean up temporary file in copyxattrfiles() André Draszik
2017-02-16 14:58 ` André Draszik [this message]
2017-02-16 15:41 ` [meta-swupd][PATCH 3/3] bundles.py: fix copying of full image to full bundle when no SWUPD_BUNDLES Patrick Ohly
2017-02-16 15:50 ` Patrick Ohly
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170216145830.21766-4-git@andred.net \
--to=git@andred.net \
--cc=yocto@yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.