summaryrefslogtreecommitdiff
path: root/scripts/build/binary_syslinux
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-03-19 00:19:26 +0000
committerLuca Boccassi <bluca@debian.org>2020-03-20 10:19:33 +0000
commit945a166f75f7bf0419a7caefa7e7337119732929 (patch)
tree7fd12a81255c8d9a65e9a309510b93fc71a0929e /scripts/build/binary_syslinux
parentd6a80d3d4dfe7153ba48c4fb1d1037557223a233 (diff)
downloadvyos-live-build-945a166f75f7bf0419a7caefa7e7337119732929.tar.gz
vyos-live-build-945a166f75f7bf0419a7caefa7e7337119732929.zip
strip progress-linux distro hacks
progress-linux, as discussed in MR #142 ([1]) is a little known distro, which appears to be little more than a personal project of the original author of live-build. given that, the expense of maintaining all of these old hacks for it cannot be justified. it is not known whether or not live-build is even used with respect to it since the author abandoned live-build some years ago. also, at least one past change in live-build possibly broke progress-linux compatibility anyway, which would have required progress-linux users of live-build to use a custom progress-linux config, or a progress-linux fork of live-build, and there is no knowing how much of the hacks in this "upstream" codebase any user of progress-linux currently relies upon. and again, progress-linux appears to just be a personal project of Daniel's, with afaik very little userbase. (Daniel seems to be the only developer working on the project which speaks to how small it is). [1]: https://salsa.debian.org/live-team/live-build/-/merge_requests/142 Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary_syslinux')
-rwxr-xr-xscripts/build/binary_syslinux48
1 files changed, 5 insertions, 43 deletions
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 0dcc2dab1..72116e5ce 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -51,16 +51,7 @@ esac
case "${LIVE_IMAGE_TYPE}" in
iso*)
_BOOTLOADER="isolinux"
-
- case "${LB_MODE}" in
- progress-linux)
- _TARGET="binary/boot"
- ;;
-
- *)
- _TARGET="binary/isolinux"
- ;;
- esac
+ _TARGET="binary/isolinux"
;;
netboot)
@@ -71,21 +62,12 @@ case "${LIVE_IMAGE_TYPE}" in
hdd*|*)
case ${LB_BINARY_FILESYSTEM} in
fat*|ntfs)
- _BOOTLOADER=syslinux
-
- case "${LB_MODE}" in
- progress-linux)
- _TARGET="binary/boot"
- ;;
-
- *)
- _TARGET="binary/syslinux"
- ;;
- esac
+ _BOOTLOADER="syslinux"
+ _TARGET="binary/syslinux"
;;
ext[234]|btrfs)
- _BOOTLOADER=extlinux
+ _BOOTLOADER="extlinux"
_TARGET="binary/boot/extlinux"
;;
*)
@@ -232,15 +214,7 @@ _LIVE_BOOT_VERSION="$(chroot chroot apt-cache policy live-boot | awk '/Installed
_LIVE_CONFIG_VERSION="$(chroot chroot apt-cache policy live-config | awk '/Installed: / { print $2 }')"
_LIVE_TOOLS_VERSION="$(chroot chroot apt-cache policy live-tools | awk '/Installed: / { print $2 }')"
-case "${LB_MODE}" in
- progress-linux)
- _PROJECT="Progress Linux"
- ;;
-
- *)
- _PROJECT="Debian GNU/Linux"
- ;;
-esac
+_PROJECT="Debian GNU/Linux"
for _FILE in "${_TARGET}"/*.cfg ${_TARGET}/*.svg
do
@@ -314,18 +288,6 @@ if [ -e binary/boot/grub/live-theme/theme.txt ]; then
binary/boot/grub/live-theme/theme.txt
fi
-case "${LB_MODE}" in
- progress-linux)
- for _FILE in "${_TARGET}/isolinux.bin" "${_TARGET}/isolinux.cfg" "${_TARGET}/syslinux.cfg"
- do
- if [ -e "${_FILE}" ]
- then
- mv "${_FILE}" "${_TARGET}/$(echo ${_FILE} | sed -e 's|.*linux|boot|')"
- fi
- done
- ;;
-esac
-
case "${LB_BUILD_WITH_CHROOT}" in
true)
# Saving cache