From b2762ed408bd6f4c3bf70390e96eb381a1d96ae1 Mon Sep 17 00:00:00 2001 From: Jan-Tarek Butt <tarek@ring0.de> Date: Sun, 14 Jan 2018 20:46:15 +0100 Subject: [PATCH] buildscript.sh: fix make manifest image dir --- buildscript.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/buildscript.sh b/buildscript.sh index 4630768..0343864 100755 --- a/buildscript.sh +++ b/buildscript.sh @@ -294,7 +294,15 @@ case "$1" in esac ;; "create_manifest") - make -C "$EXECDIR/.." manifest + if ! [ -r "$EXECDIR"/.prepare ]; then + echo "please run the prepare mode first" + exit 1 + fi + 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 ;; *) help_print -- GitLab