aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-04-18 10:33:33 +0100
committerJoshua Lock <joshua.g.lock@intel.com>2016-04-18 10:58:18 +0100
commit59ed994ad7442373e2766be816cef91ab2fac390 (patch)
tree739e413b6664a0779a1ac182ebfa466b5e966b3e
parent6f2fc59243293443f1a6194c479bd2646308cc28 (diff)
downloadmeta-swupd-59ed994ad7442373e2766be816cef91ab2fac390.tar.gz
meta-swupd-59ed994ad7442373e2766be816cef91ab2fac390.tar.bz2
meta-swupd-59ed994ad7442373e2766be816cef91ab2fac390.zip
swupdbundle: don't try and build bootimg
We already unset IMAGE_FSTYPES to prevent any images being written for the transient bundle images. As a logical follow on from that change, and to prevent issues when trying to build for a MACHINE which supports live images (due to the automatic inference of live image support via build_live() in image.bbclass), delete the do_bootimg task for bundle images. Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
-rw-r--r--classes/swupdbundle.bbclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/classes/swupdbundle.bbclass b/classes/swupdbundle.bbclass
index f008737..819dd85 100644
--- a/classes/swupdbundle.bbclass
+++ b/classes/swupdbundle.bbclass
@@ -45,6 +45,10 @@ python swupdbundle_virtclass_handler () {
# Not producing any real images, only the rootfs directory.
e.data.setVar("IMAGE_FSTYPES", "")
+ # Delete the bootimg task as we don't require it for transient images and
+ # its dependent tasks are unlikely to be scheduled due to unsetting
+ # IMAGE_FSTYPES above.
+ bb.build.deltask('do_bootimg', e.data)
curr_install = (e.data.getVar('IMAGE_INSTALL', True) or "").split()
def get_bundle_contents(bndl):