Add release tags to most places where a version is used

master
Matthias Klumpp 5 years ago
parent 3273c345a5
commit 1e4ef3a61a

@ -44,8 +44,9 @@ dist_reltag=""
case "$SUITE" in case "$SUITE" in
byzantium) byzantium)
dist_version="10~devel" dist_version="10"
lb_opts="$lb_opts --security true --updates true" lb_opts="$lb_opts --security true --updates true"
dist_reltag="~devel"
;; ;;
amber) amber)
dist_version="9.0" dist_version="9.0"
@ -56,7 +57,7 @@ case "$SUITE" in
dist_version="0.0" dist_version="0.0"
;; ;;
esac esac
VERSION_PRETTY=$dist_version VERSION_FULL="${dist_version}${dist_reltag}"
# live-build doesn't work if --parent-debian-distribution is unknown of # live-build doesn't work if --parent-debian-distribution is unknown of
@ -173,13 +174,13 @@ casper
EOF EOF
# Configure bootloader # Configure bootloader
sed -e s/@VERSION@/"$VERSION_PRETTY"/g config/bootloaders/splash.svg.in > config/bootloaders/splash.svg sed -e s/@VERSION@/"$VERSION_FULL"/g config/bootloaders/splash.svg.in > config/bootloaders/splash.svg
mv -f config/bootloaders/splash.svg config/bootloaders/isolinux/ mv -f config/bootloaders/splash.svg config/bootloaders/isolinux/
# Update GRUB EFI menu for our flavor # Update GRUB EFI menu for our flavor
sed -e s/@FLAVOR@/"$FLAVOR"/g config/bootloaders/grub-efi.cfg.in > config/bootloaders/isolinux/grub-efi.cfg sed -e s/@FLAVOR@/"$FLAVOR"/g config/bootloaders/grub-efi.cfg.in > config/bootloaders/isolinux/grub-efi.cfg
IMAGE_FILENAME=pureos-${dist_version}-${FLAVOR}_${CURRENT_DATE} IMAGE_FILENAME=pureos-${VERSION_FULL}-${FLAVOR}_${CURRENT_DATE}
lb config noauto \ lb config noauto \
--distribution "$SUITE" \ --distribution "$SUITE" \

Loading…
Cancel
Save