From 0c5d69f3194a832e3512a130c80bcfaac619607a Mon Sep 17 00:00:00 2001
From: Jan-Tarek Butt <tarek@ring0.de>
Date: Sat, 22 Apr 2023 01:24:41 +0200
Subject: [PATCH] buildscript.sh: use bash arrays for make parameter handling.
create rc.manifest on create_manifest call aswell
Signed-off-by: Jan-Tarek Butt <tarek@ring0.de>
---
buildscript.sh | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/buildscript.sh b/buildscript.sh
index f54925e..ef80ac7 100755
--- a/buildscript.sh
+++ b/buildscript.sh
@@ -374,13 +374,21 @@ case "$1" in
echo "please run the prepare mode first"
exit 1
fi
+ preflags=(-C "$EXECDIR"/..)
+ midflags=()
+ postflags=( GLUON_IMAGEDIR=output/images/"$(cat "$EXECDIR"/.prepare)"/"$(cat "$EXECDIR"/.GLUON_RELEASE)" GLUON_PACKAGEDIR=output/packages/"$(cat "$EXECDIR"/.prepare)")
if [ -a "$EXECDIR/.BROKEN" ]; then
- make -C "$EXECDIR/.." manifest BROKEN=1 GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")"
- else
- make -C "$EXECDIR/.." manifest GLUON_IMAGEDIR="output/images/$(cat "$EXECDIR/.prepare")/$(cat "$EXECDIR/.GLUON_RELEASE")" GLUON_PACKAGEDIR="output/packages/$(cat "$EXECDIR/.prepare")"
- fi
+ midflags=("${midflags[@]}" BROKEN=1)
+ fi;
+ make "${preflags[@]}" manifest "${midflags[@]}" "${postflags[@]}"
+ # create rc branch manifest
+ if [ -f "$EXECDIR/../output/images/$(cat "$EXECDIR"/.prepare)/$(cat "$EXECDIR"/.GLUON_RELEASE)/sysupgrade/$(cat "$EXECDIR"/.GLUON_AUTOUPDATER_BRANCH).manifest" ]; then
+ cp "$EXECDIR/../output/images/$(cat "$EXECDIR"/.prepare)/$(cat "$EXECDIR"/.GLUON_RELEASE)/sysupgrade/$(cat "$EXECDIR"/.GLUON_AUTOUPDATER_BRANCH).manifest" "$EXECDIR/../output/images/$(cat "$EXECDIR"/.prepare)/$(cat "$EXECDIR"/.GLUON_RELEASE)/sysupgrade/rc.manifest"
+ sed -i 's/BRANCH=stable/BRANCH=rc/g' "$EXECDIR/../output/images/$(cat "$EXECDIR"/.prepare)/$(cat "$EXECDIR"/.GLUON_RELEASE)/sysupgrade/rc.manifest"
+ fi;
;;
*)
help_print
;;
esac
+
--
GitLab