aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-10-03 16:21:03 +0100
committerJoshua Lock <joshua.g.lock@intel.com>2016-10-03 17:01:35 +0100
commite1eecbfe54b1b3508973f6a07e918dd9f0fd490b (patch)
tree13c9490af07a5f1b61cd305544c0022edff8e916
parentac2ada675cf100fcc748722570a4063c468f78e2 (diff)
downloadmeta-swupd-pre-sstate.zip
meta-swupd-pre-sstate.tar.gz
meta-swupd-pre-sstate.tar.bz2
swupd-image: prevent buildhistory failurepre-sstate
When buildstats detects TaskSucceeded for a do_rootfs task it will try and determine the size of the rootfs using du, if the rootfs directory isn't present the call to du fails which triggers a bb.error. Since e587c50c2639989d02d282c7a91134d5934eb042 do_rootfs for swumpdimage based virtual images has been an empty function which simply returns as soon as it's invoked, as we populate the rootfs from the mega rootfs contents in do_image. Due to this the rootfs directory wasn't yet present at the time buildstats detects the TaskSucceeded and the subsequent call to du fails. Work around this by creating an empty rootfs directory during do_rootfs in swupdimage. Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
-rw-r--r--classes/swupdimage.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/swupdimage.bbclass b/classes/swupdimage.bbclass
index c1bda2f..1f11a8c 100644
--- a/classes/swupdimage.bbclass
+++ b/classes/swupdimage.bbclass
@@ -52,7 +52,7 @@ python swupdimage_virtclass_handler () {
# 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")
+ e.data.setVar("do_rootfs", " bb.utils.mkdirhier(d.getVar('IMAGE_ROOTFS', True))\n")
# Depend on complete bundle generation in the base image.
dep = ' %s:do_swupd_update' % pn_base
e.data.appendVarFlag('do_image', 'depends', dep)