aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-06-01 15:15:39 +0100
committerJoshua Lock <joshua.g.lock@intel.com>2016-06-01 15:15:39 +0100
commitedf0a04d8dce607654d5ac44129b7183b52ba141 (patch)
tree1d2839bcb7f090d7f9486998197a1c7698fe8b52
parent01f7c8bc322508f8781e532bbb75784d0d29fd82 (diff)
downloadmeta-swupd-edf0a04d8dce607654d5ac44129b7183b52ba141.tar.gz
meta-swupd-edf0a04d8dce607654d5ac44129b7183b52ba141.tar.bz2
meta-swupd-edf0a04d8dce607654d5ac44129b7183b52ba141.zip
swupd-image: also write os-core to groups.ini file
Based on observation of Clear Linux's Mixer and the fact that swupd-server, since the addition of bundle includes in 3.20, segfaults when loading a manifest for a previous OS release that includes the os-core (the default behaviour since the addition of includes) we infer that it's previously expected and now required to include the os-core bundle in the groups.ini file. With this change generating updates beyond the first using swupd-server v3.x no longer causes swupd_create_update to segfault. Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
-rw-r--r--classes/swupd-image.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/swupd-image.bbclass b/classes/swupd-image.bbclass
index 06bcb87..9bb6de4 100644
--- a/classes/swupd-image.bbclass
+++ b/classes/swupd-image.bbclass
@@ -473,7 +473,8 @@ END
rm ${DEPLOY_DIR_SWUPD}/groups.ini
fi
touch ${GROUPS_INI}
- for bndl in ${SWUPD_BUNDLES}; do
+ ALL_BUNDLES="os-core ${SWUPD_BUNDLES}"
+ for bndl in ${ALL_BUNDLES}; do
echo "[$bndl]" >> ${GROUPS_INI}
echo "group=$bndl" >> ${GROUPS_INI}
echo "" >> ${GROUPS_INI}
@@ -486,8 +487,7 @@ END
${STAGING_BINDIR_NATIVE}/swupd_make_fullfiles -S ${DEPLOY_DIR_SWUPD} ${OS_VERSION}
${SWUPD_LOG_FN} "Generating zero packs, this can take some time."
- bundles="os-core ${SWUPD_BUNDLES}"
- for bndl in $bundles; do
+ for bndl in ${ALL_BUNDLES}; do
${SWUPD_LOG_FN} "Generating zero pack for $bndl"
${STAGING_BINDIR_NATIVE}/swupd_make_pack -S ${DEPLOY_DIR_SWUPD} 0 ${OS_VERSION} $bndl
done