aboutsummaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-06-22 12:18:45 +0100
committerJoshua Lock <joshua.g.lock@intel.com>2016-06-22 14:05:04 +0100
commit82736ca5054ba1a8fcbd0e230d8a4500cc31de57 (patch)
tree2d894e9fb9acbc9b3fd77f4cc28c32966bdd1bfc /classes
parentae1cb83906324e4e5f6dcbdfec90f5d7e523f254 (diff)
downloadmeta-swupd-82736ca5054ba1a8fcbd0e230d8a4500cc31de57.tar.gz
meta-swupd-82736ca5054ba1a8fcbd0e230d8a4500cc31de57.tar.bz2
meta-swupd-82736ca5054ba1a8fcbd0e230d8a4500cc31de57.zip
swupd-image: ensure SSTATE_MANFILEPREFIX is set for derived images
Ensure the manifest files are written with a uniform filename pattern for all swupd-image derived images. Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Diffstat (limited to 'classes')
-rw-r--r--classes/swupd-image.bbclass12
1 files changed, 6 insertions, 6 deletions
diff --git a/classes/swupd-image.bbclass b/classes/swupd-image.bbclass
index 6d7b65e..7a38173 100644
--- a/classes/swupd-image.bbclass
+++ b/classes/swupd-image.bbclass
@@ -61,6 +61,12 @@ python () {
megarootfs = megarootfs.replace('/' + pn +'/', '/bundle-%s-mega/' % (pn_base or pn))
d.setVar('MEGA_IMAGE_ROOTFS', megarootfs)
+ # We need to use a custom manifest filename for stage_swupd_inputs so that
+ # the generated sstate can be used to fetch inputs for multiple "releases"
+ manfileprefix = d.getVar('SSTATE_MANFILEPREFIX', True)
+ manfileprefix = manfileprefix + '-' + ver
+ d.setVar('SSTATE_MANFILEPREFIX', manfileprefix)
+
if pn_base is not None:
# We want all virtual images from this recipe to deploy to the same
# directory
@@ -155,12 +161,6 @@ python () {
mega_name = (' bundle-%s-mega:do_image_complete' % pn)
d.appendVarFlag('do_image', 'depends', mega_name)
d.appendVarFlag('do_stage_swupd_inputs', 'depends', mega_name)
-
- # We need to use a custom manifest filename for stage_swupd_inputs so that
- # the generated sstate can be used to fetch inputs for multiple "releases"
- manfileprefix = d.getVar('SSTATE_MANFILEPREFIX', True)
- manfileprefix = manfileprefix + '-' + ver
- d.setVar('SSTATE_MANFILEPREFIX', manfileprefix)
}
# swupd-client expects a bundle subscription to exist for each