mirror of
https://github.com/clearlinux/swupd-server.git
synced 2026-09-03 12:11:40 +00:00
Use --statedir in the builder scripts
Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
This commit is contained in:
+4
-4
@@ -23,8 +23,8 @@ export LEAF_CERT="leaf.cert.pem"
|
||||
export CA_CHAIN_CERT="ca-chain.cert.pem"
|
||||
export PASSPHRASE="${SWUPD_CERTS_DIR}/passphrase"
|
||||
|
||||
${SWUPDREPO}/swupd_create_update --osversion ${VER}
|
||||
${SWUPDREPO}/swupd_make_fullfiles ${VER}
|
||||
${SWUPDREPO}/swupd_create_update --osversion ${VER} --statedir ${UPDATEDIR}
|
||||
${SWUPDREPO}/swupd_make_fullfiles --statedir ${UPDATEDIR} ${VER}
|
||||
|
||||
pushd ${SWUPDREPO}
|
||||
|
||||
@@ -36,7 +36,7 @@ fi
|
||||
BUNDLE_LIST=$(cat ${MOM} | awk -v V=${VER} '$1 ~ /^M\./ && $3 == V { print $4 }')
|
||||
for BUNDLE in $BUNDLE_LIST; do
|
||||
#background them for parallelization
|
||||
${SWUPDREPO}/swupd_make_pack 0 ${VER} ${BUNDLE} &
|
||||
${SWUPDREPO}/swupd_make_pack --statedir ${UPDATEDIR} 0 ${VER} ${BUNDLE} &
|
||||
done
|
||||
#now await all completing
|
||||
for job in $(jobs -p); do
|
||||
@@ -60,7 +60,7 @@ if [ "${STAGING}" -lt "${VER}" ]; then
|
||||
echo ${VER} > ${UPDATEDIR}/www/version/formatstaging/latest
|
||||
fi
|
||||
|
||||
#valgrind ${SWUPDREPO}/swupd_create_update ${VER}
|
||||
#valgrind ${SWUPDREPO}/swupd_create_update --osversion ${VER} --statedir ${UPDATEDIR}
|
||||
time hardlink ${UPDATEDIR}/image/${VER}/*
|
||||
time hardlink ${UPDATEDIR}/image/${PREVREL} ${UPDATEDIR}/image/${VER}
|
||||
time hardlink ${UPDATEDIR}/www/${PREVREL} ${UPDATEDIR}/www/${VER}
|
||||
|
||||
+3
-3
@@ -53,13 +53,13 @@ if [ ! -e ${MOM} ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
#time ${SWUPDREPO}/swupd_make_fullfiles ${VER}
|
||||
#time ${SWUPDREPO}/swupd_make_fullfiles --statedir ${UPDATEDIR} ${VER}
|
||||
|
||||
BUNDLE_LIST=$(cat ${MOM} | awk -v V=${VER} '$1 ~ /^M\./ && $3 == V { print $4 }')
|
||||
|
||||
# build packs for all bundles changed in $VER
|
||||
for BUNDLE in $BUNDLE_LIST; do
|
||||
#${SWUPDREPO}/swupd_make_pack 0 ${VER} ${BUNDLE} &
|
||||
#${SWUPDREPO}/swupd_make_pack --statedir ${UPDATEDIR} 0 ${VER} ${BUNDLE} &
|
||||
|
||||
BUNDLE_VER_LIST=""
|
||||
MANIFEST_VER=$(cat ${SWUPDWEBDIR}/$VER/Manifest.MoM | grep "^previous:" | cut -f 2)
|
||||
@@ -87,7 +87,7 @@ for BUNDLE in $BUNDLE_LIST; do
|
||||
if [ -e ${SWUPDWEBDIR}/${VER}/pack-${BUNDLE}-from-$v.tar ]; then
|
||||
echo "${VER}/pack-${BUNDLE}-from-$v.tar already exists, skipping."
|
||||
else
|
||||
${SWUPDREPO}/swupd_make_pack $v ${VER} ${BUNDLE}
|
||||
${SWUPDREPO}/swupd_make_pack --statedir ${UPDATEDIR} $v ${VER} ${BUNDLE}
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user