swupdimage.bbclass: ensure that do_rootfs gets executed
PATCH 1/1 swupdimage.bbclass: ensure that do_rootfs gets executed
OE-core commit 6d969bacc718e changed do_rootfs so that it creates IMGDEPLOYDIR. That change broke the creation of additional swupd images, because setting do_rootfs to empty caused the entire task to be skipped, including the evaluation of the 'cleandirs' task attribute.
It remains to be seen whether that's really the desired behavior (see
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10256), but as it is what it is right now, we need to avoid the situation by overwriting do_rootfs with non-empty code that doesn't do anything. That way, the directory gets created.
--- classes/swupdimage.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
classes/swupdimage.bbclass +5 -1
@@ -48,7 +48,11 @@ python swupdimage_virtclass_handler () { e.data.setVar("IMAGE_BUNDLE_NAME", imageext) # We override the default methods such that they only copy from the mega rootfs. e.data.setVar("do_image", " import swupd.rootfs\n swupd.rootfs.create_rootfs(d)\n") - e.data.setVar("do_rootfs", "") + # do_rootfs must not be empty, because empty tasks get skipped + # and we don't want that for do_rootfs because its cleandirs + # variable triggers the creation of the IMGDEPLOYDIR that we + # are going to write into. + e.data.setVar("do_rootfs", " pass") # Depend on complete bundle generation in the base image. dep = ' %s:do_stage_swupd_inputs' % pn_base e.data.appendVarFlag('do_image', 'depends', dep)
Signature · 1 line
2.1.4
Hello Joshua!
Please also apply to the pre-sstate branch. There's a slight merge conflict (previous line differs), but that's easy to resolve, so I am not sending that as a separate patch.
Signature · 6 lines
Best Regards, Patrick Ohly The content of this message is my personal opinion only and although I am an employee of Intel, the statements I make here in no way represent Intel's position on the issue, nor am I authorized to speak on behalf of Intel on this matter.
Lock, Joshua G
AppliedQuoted 6 lines · Patrick Ohly
OE-core commit
6d969bacc718echangeddo_rootfsso that it creates IMGDEPLOYDIR. That change broke the creation of additional swupd images, because settingdo_rootfsto empty caused the entire task to be skipped, including the evaluation of the 'cleandirs' task attribute.
Quoted 6 lines
It remains to be seen whether that's really the desired behavior (see
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10256), but as it is
what it is right now, we need to avoid the situation by overwritingdo_rootfswith non-empty code that doesn't do anything. That way, the directory gets created.
Pushed to master (and presstate). Thanks!
Joshua
Quoted 17 lines
Signed-off-by Patrick Ohly <[email protected]>---
classes/swupdimage.bbclass | 6 +++++-1 file changed, 5 insertions(+), 1 deletion(-)classes/swupdimage.bbclass +0
-0@@ -48,7 +48,11 @@ python swupdimage_virtclass_handler () { e.data.setVar("IMAGE_BUNDLE_NAME", imageext) # We override the default methods such that they only copy fromthe mega rootfs.
e.data.setVar("do_image", " import swupd.rootfs\n swupd.rootfs.create_rootfs(d)\n") - e.data.setVar("do_rootfs", "")
Quoted 8 lines
+ #
do_rootfsmust not be empty, because empty tasks get skipped + # and we don't want that fordo_rootfsbecause its cleandirs + # variable triggers the creation of the IMGDEPLOYDIR that we + # are going to write into.
+ e.data.setVar("do_rootfs", " pass")
# Depend on complete bundle generation in the base image. dep = ' %s:do_stage_swupd_inputs' %pn_basee.data.appendVarFlag('do_image', 'depends', dep)
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47
This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.