aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2016-09-12 09:09:26 +0200
committerJoshua Lock <joshua.g.lock@intel.com>2016-09-12 09:39:22 +0100
commitac2ada675cf100fcc748722570a4063c468f78e2 (patch)
tree1e31ec10869a2a5adc9a00cd05b30576a498a7ac
parentc5fd33b0bb812b683f3ccd106a8c1a0e319b2ac2 (diff)
downloadmeta-swupd-ac2ada675cf100fcc748722570a4063c468f78e2.tar.gz
meta-swupd-ac2ada675cf100fcc748722570a4063c468f78e2.tar.bz2
meta-swupd-ac2ada675cf100fcc748722570a4063c468f78e2.zip
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. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
-rw-r--r--classes/swupdimage.bbclass6
1 files changed, 5 insertions, 1 deletions
diff --git a/classes/swupdimage.bbclass b/classes/swupdimage.bbclass
index 0a5da0d..c1bda2f 100644
--- a/classes/swupdimage.bbclass
+++ b/classes/swupdimage.bbclass
@@ -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", " swupd_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_swupd_update' % pn_base
e.data.appendVarFlag('do_image', 'depends', dep)