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

14 files changed, 18 insertions, 266 deletions

diff --git a/scripts/build/binary_checksums b/scripts/build/binary_checksums
index a2aef0351..07df5f82f 100755
--- a/scripts/build/binary_checksums
+++ b/scripts/build/binary_checksums
@@ -37,15 +37,7 @@ Acquire_lockfile
 
 for CHECKSUM in ${LB_CHECKSUMS}
 do
-	case "${LB_MODE}" in
-		progress-linux)
-			CHECKSUMS="$(echo ${CHECKSUM} | tr [a-z] [A-Z])SUMS"
-			;;
-
-		*)
-			CHECKSUMS="${CHECKSUM}sum.txt"
-			;;
-	esac
+	CHECKSUMS="${CHECKSUM}sum.txt"
 
 	Echo_message "Begin creating binary ${CHECKSUMS}..."
 
diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk
index b53fff705..a2bdf9ad9 100755
--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@@ -60,12 +60,6 @@ case "${LB_MODE}" in
 		TRACE="project/trace/ftp-master.debian.org"
 		;;
 
-	progress-linux)
-		TITLE="Progress Linux"
-		STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}"
-		TRACE="project/trace/archive-master.progress-linux.org"
-		;;
-
 	*)
 		TITLE="Debian GNU/Linux"
 		STRING="Snapshot ${ARCHITECTURE}"
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index f3abe6bc8..d253baaaf 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -133,19 +133,9 @@ do
 			;;
 
 		syslinux)
-			case "${LB_MODE}" in
-				progress-linux)
-					XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/boot.bin -c boot/boot.cat"
-					XORRISO_EXCLUDE="boot/boot.bin"
-					;;
-
-				*)
-					XORRISO_OPTIONS="${XORRISO_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
-					XORRISO_EXCLUDE="isolinux/isolinux.bin"
-					;;
-			esac
-
+			XORRISO_OPTIONS="${XORRISO_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
 			XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
+			XORRISO_EXCLUDE="isolinux/isolinux.bin"
 			;;
 
 		grub-efi)
diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists
index 3db37d763..2cbadce61 100755
--- a/scripts/build/binary_package-lists
+++ b/scripts/build/binary_package-lists
@@ -32,17 +32,8 @@ Check_stagefile
 # Acquire lock file
 Acquire_lockfile
 
-case "${LB_MODE}" in
-	progress-linux)
-		DISTS="installer/dists"
-		POOL="installer/pool"
-		;;
-
-	*)
-		DISTS="dists"
-		POOL="pool"
-		;;
-esac
+DISTS="dists"
+POOL="pool"
 
 if ls config/package-lists/*.list > /dev/null 2>&1 || \
    ls config/package-lists/*.list.binary > /dev/null 2>&1
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
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader
index ed90d1f0c..16d81bc10 100755
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -37,15 +37,7 @@ Check_stagefile
 # Acquire lock file
 Acquire_lockfile
 
-case "${LB_MODE}" in
-	progress-linux)
-		RUN_LABEL="Run Progress Linux"
-		;;
-
-	*)
-		RUN_LABEL="Run Debian GNU/Linux"
-		;;
-esac
+RUN_LABEL="Run Debian GNU/Linux"
 
 case "${LB_ARCHITECTURES}" in
 	amd64|i386)
diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt
index 888edbb2f..b5dec63f8 100755
--- a/scripts/build/chroot_apt
+++ b/scripts/build/chroot_apt
@@ -142,68 +142,6 @@ case "${1}" in
 			esac
 		fi
 
-		case "${LB_MODE}" in
-			progress-linux)
-				if [ ! -e chroot/etc/apt/preferences.d/progress-linux.pref ]
-				then
-					_DISTRIBUTION="$(echo ${LB_DISTRIBUTION_BINARY} | sed -e 's|-backports||')"
-
-					_ENABLE_DISTRIBUTIONS="${_DISTRIBUTION}"
-					_DISABLE_DISTRIBUTIONS=""
-
-					if [ "${LB_SECURITY}" = "true" ]
-					then
-						_ENABLE_DISTRIBUTIONS="${_ENABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-security"
-					fi
-
-					if [ "${LB_UPDATES}" = "true" ]
-					then
-						_ENABLE_DISTRIBUTIONS="${_ENABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-updates"
-					fi
-
-					case "${LB_DISTRIBUTION_BINARY}" in
-						*-backports)
-							if [ "${LB_BACKPORTS}" = "true" ]
-							then
-								_ENABLE_DISTRIBUTIONS="${_ENABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-backports"
-							fi
-							;;
-
-						*)
-							if [ "${LB_BACKPORTS}" = "true" ]
-							then
-								_DISABLE_DISTRIBUTIONS="${_DISABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-backports"
-							fi
-							;;
-					esac
-
-					for _DISTRIBUTION in ${_ENABLE_DISTRIBUTIONS}
-					do
-
-cat >> chroot/etc/apt/preferences.d/progress-linux.pref << EOF
-
-Package: *
-Pin: release n=${_DISTRIBUTION}
-Pin-Priority: 999
-EOF
-
-					done
-
-					for _DISTRIBUTION in ${_DISABLE_DISTRIBUTIONS}
-					do
-
-cat >> chroot/etc/apt/preferences.d/progress-linux.pref << EOF
-
-#Package: *
-#Pin: release n=${_DISTRIBUTION}
-#Pin-Priority: 999
-EOF
-
-					done
-				fi
-				;;
-		esac
-
 		# Creating stage file
 		Create_stagefile
 		;;
diff --git a/scripts/build/chroot_firmware b/scripts/build/chroot_firmware
index e23026bb5..11a4f41ae 100755
--- a/scripts/build/chroot_firmware
+++ b/scripts/build/chroot_firmware
@@ -54,20 +54,9 @@ Check_package host /usr/bin/wget wget
 FIRMWARE_PACKAGES=""
 
 # Manually add firmware-linux/non-free meta package
-if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
+if [ "${LB_DERIVATIVE}" = "false" ] && echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
 then
-	if [ "${LB_DERIVATIVE}" != "true" ]
-	then
-		FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
-	else
-		case "${LB_DERIVATIVE_IS_BASED_ON}" in
-			debian)
-				FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
-				;;
-			*)
-				;;
-		esac
-	fi
+	FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
 fi
 
 Firmware_List_From_Contents "${LB_PARENT_MIRROR_CHROOT}" "${LB_PARENT_DISTRIBUTION_CHROOT}" "${LB_PARENT_ARCHIVE_AREAS}"
diff --git a/scripts/build/config b/scripts/build/config
index b14139176..fe8ba1282 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -95,7 +95,7 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--mirror-chroot URL]\n\
 \t    [--mirror-chroot-security URL]\n\
 \t    [--mirror-debian-installer URL]\n\
-\t    [--mode debian|progress-linux]\n\
+\t    [--mode debian]\n\
 \t    [--net-cow-filesystem nfs|cfs]\n\
 \t    [--net-cow-mountoptions OPTIONS]\n\
 \t    [--net-cow-path PATH]\n\
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
index d974b95a5..d4b9562d5 100755
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@@ -263,14 +263,6 @@ case "${LB_DERIVATIVE}" in
 		else
 			URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images"
 		fi
-
-		if [ "${LB_MODE}" = "progress-linux" ]
-		then
-			# FIXME: normal derivatives probably don't rebuild d-i,
-			# but progress-linux does.
-			URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images"
-		fi
-		;;
 esac
 
 mkdir -p "${DESTDIR_DI}"
@@ -346,20 +338,9 @@ then
 		FIRMWARE_PACKAGES=""
 
 		# Manually add firmware-linux/non-free meta package
-		if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
+		if [ "${LB_DERIVATIVE}" = "false" ] && echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
 		then
-			if [ "${LB_DERIVATIVE}" != "true" ]
-			then
-				FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
-			else
-				case "${LB_DERIVATIVE_IS_BASED_ON}" in
-					debian)
-						FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
-						;;
-					*)
-						;;
-				esac
-			fi
+			FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
 		fi
 
 		Firmware_List_From_Contents "${LB_PARENT_MIRROR_CHROOT}" "${LB_PARENT_DISTRIBUTION_CHROOT}" "${LB_PARENT_ARCHIVE_AREAS}"
@@ -857,22 +838,6 @@ then
 	fi
 fi
 
-case "${LB_MODE}" in
-	progress-linux)
-		mv binary/install binary/installer
-
-		rm -f binary/debian
-
-		for _DIRECTORY in dists pool project firmware
-		do
-			if [ -e "binary/${_DIRECTORY}" ]
-			then
-				mv binary/"${_DIRECTORY}" binary/installer
-			fi
-		done
-		;;
-esac
-
 # Saving cache
 Save_package_cache binary
 
diff --git a/scripts/build/installer_preseed b/scripts/build/installer_preseed
index 5ccdc37aa..75b9fc02c 100755
--- a/scripts/build/installer_preseed
+++ b/scripts/build/installer_preseed
@@ -40,15 +40,7 @@ if ls config/preseed/*.cfg > /dev/null 2>&1 || \
    ls config/preseed/*.cfg.installer > /dev/null 2>&1 || \
    ls chroot/root/packages.installer > /dev/null 2>&1
 then
-	case "${LB_MODE}" in
-		progress-linux)
-			_DIRECTORY="binary/installer"
-			;;
-
-		*)
-			_DIRECTORY="binary/install"
-			;;
-	esac
+	_DIRECTORY="binary/install"
 
 	rm -f "${_DIRECTORY}/preseed.cfg"
 
diff --git a/scripts/build/source_checksums b/scripts/build/source_checksums
index f4321a6b3..06157c162 100755
--- a/scripts/build/source_checksums
+++ b/scripts/build/source_checksums
@@ -44,15 +44,7 @@ do
 
 	for CHECKSUM in ${LB_CHECKSUMS}
 	do
-		case "${LB_MODE}" in
-			progress-linux)
-				CHECKSUMS="$(echo ${CHECKSUM} | tr [a-z] [A-Z])SUMS"
-				;;
-
-			*)
-				CHECKSUMS="${CHECKSUM}sum.txt"
-				;;
-		esac
+		CHECKSUMS="${CHECKSUM}sum.txt"
 
 		Echo_message "Begin creating source ${CHECKSUMS}..."
 
diff --git a/scripts/build/source_debian b/scripts/build/source_debian
index e1555d14f..b9899b2bc 100755
--- a/scripts/build/source_debian
+++ b/scripts/build/source_debian
@@ -103,37 +103,6 @@ then
 	echo "${LB_TASKSEL}" >> source-selection.txt
 fi
 
-# apt-get source does not respect pinning
-# building images with backports included but not enabled
-# will result in apt-get source download stuff from backports
-# where available. workaround: disable backports
-case "${LB_MODE}" in
-	progress-linux)
-		case "${LB_DISTRIBUTION_BINARY}" in
-			*-backports)
-
-				;;
-
-			*)
-				if grep -qs "${LB_DISTRIBUTION_BINARY}-backports" chroot/etc/apt/sources.list.d/progress-linux.list
-				then
-					cp chroot/etc/apt/sources.list.d/progress-linux.list chroot/etc/apt/sources.list.d/progress-linux.list.orig
-
-					while read -r _LINE
-					do
-						if echo "${_LINE}" | grep -qs ${LB_DISTRIBUTION_BINARY}-backports
-						then
-							sed -i -e "s|${_LINE}|#${_LINE}|" chroot/etc/apt/sources.list.d/progress-linux.list
-						fi
-					done < chroot/etc/apt/sources.list.d/progress-linux.list.orig
-
-					Apt chroot update
-				fi
-				;;
-		esac
-		;;
-esac
-
 # Make a clean directory to download the packages to.
 # We need to set the ownership to user `_apt` to give write access to the apt user,
 # otherwise we get a lot of warnings from apt about downloading as root.
@@ -202,14 +171,6 @@ done
 
 rmdir --ignore-fail-on-non-empty chroot/source.pkgs
 
-# Reverting apt sources again
-if [ -e chroot/etc/apt/sources.list.d/progress-linux.list.orig ]
-then
-	mv chroot/etc/apt/sources.list.d/progress-linux.list.orig chroot/etc/apt/sources.list.d/progress-linux.list
-
-	Apt chroot update
-fi
-
 # Creating stage file
 Create_stagefile
 Create_stagefile "source"
diff --git a/scripts/build/source_disk b/scripts/build/source_disk
index 5e4ffc66b..ca2bf6109 100755
--- a/scripts/build/source_disk
+++ b/scripts/build/source_disk
@@ -60,12 +60,6 @@ case "${LB_MODE}" in
 		TRACE="project/trace/ftp-master.debian.org"
 		;;
 
-	progress-linux)
-		TITLE="Progress Linux"
-		STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}"
-		TRACE="project/trace/archive-master.progress-linux.org"
-		;;
-
 	*)
 		TITLE="Debian GNU/Linux"
 		STRING="Snapshot ${ARCHITECTURE}"