Skip to content

Commit e73b635

Browse files
committed
build-x86-images: allow external date to be set, add -t triplet
-t arch-date-variant allows for simpler makefile and easier CI
1 parent f80794a commit e73b635

1 file changed

Lines changed: 17 additions & 6 deletions

File tree

build-x86-images.sh

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,22 @@ set -eu
77
PROGNAME=$(basename "$0")
88
ARCH=$(uname -m)
99
IMAGES="base enlightenment xfce mate cinnamon gnome kde lxde lxqt"
10+
TRIPLET=
1011
REPO=
11-
DATE=$(date +%Y%m%d)
12+
DATE=$(date -u +%Y%m%d)
1213

1314
help() {
14-
echo "$PROGNAME: [-a arch] [-b base|enlightenment|xfce|mate|cinnamon|gnome|kde|lxde|lxqt] [-r repo]" >&2
15+
echo "$PROGNAME: [-a arch] [-b base|enlightenment|xfce|mate|cinnamon|gnome|kde|lxde|lxqt] [-d date] [-t arch-date-variant] [-r repo]" >&2
1516
}
1617

17-
while getopts "a:b:hr:V" opt; do
18+
while getopts "a:b:d:t:hr:V" opt; do
1819
case $opt in
1920
a) ARCH="$OPTARG";;
2021
b) IMAGES="$OPTARG";;
22+
d) DATE="$OPTARG";;
2123
h) help; exit 0;;
2224
r) REPO="-r $OPTARG $REPO";;
25+
t) TRIPLET="$OPTARG";;
2326
V) version; exit 0;;
2427
*) help; exit 1;;
2528
esac
@@ -116,6 +119,14 @@ else
116119
exit 1
117120
fi
118121

119-
for image in $IMAGES; do
120-
build_variant "$image" "$@"
121-
done
122+
if [ -n "$TRIPLET" ]; then
123+
VARIANT="${TRIPLET##*-}"
124+
REST="${TRIPLET%-*}"
125+
DATE="${REST##*-}"
126+
ARCH="${REST%-*}"
127+
build_variant "$VARIANT" "$@"
128+
else
129+
for image in $IMAGES; do
130+
build_variant "$image" "$@"
131+
done
132+
fi

0 commit comments

Comments
 (0)