aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-04-14 17:10:52 +0100
committerJoshua Lock <joshua.g.lock@intel.com>2016-04-14 17:13:54 +0100
commita7dddfbfb8f45989856c93c6f82f46d8a96e6f0b (patch)
tree3f5b66ddd27f56105319d0b7833fee46105cdc49
parent252ce007e58748ada766b6153c26e280aac10af9 (diff)
downloadmeta-swupd-a7dddfbfb8f45989856c93c6f82f46d8a96e6f0b.tar.gz
meta-swupd-a7dddfbfb8f45989856c93c6f82f46d8a96e6f0b.tar.bz2
meta-swupd-a7dddfbfb8f45989856c93c6f82f46d8a96e6f0b.zip
swupdbundle: disable image construction differently
Mark do_image and do_bootimg as noexec tasks so that they don't run but their task dependency chain is preserved. This prevents an error in swupdbundle image building when an image for the target MACHINE would result in a live image being built. Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
-rw-r--r--classes/swupdbundle.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/classes/swupdbundle.bbclass b/classes/swupdbundle.bbclass
index f008737..533f141 100644
--- a/classes/swupdbundle.bbclass
+++ b/classes/swupdbundle.bbclass
@@ -44,7 +44,8 @@ python swupdbundle_virtclass_handler () {
basebundle = bundle
# Not producing any real images, only the rootfs directory.
- e.data.setVar("IMAGE_FSTYPES", "")
+ e.data.setVarFlag("do_image", "noexec", "1")
+ e.data.setVarFlag("do_bootimg", "noexec", "1")
curr_install = (e.data.getVar('IMAGE_INSTALL', True) or "").split()
def get_bundle_contents(bndl):