Dropping support for wheezy.

4 files changed, 19 insertions, 89 deletions

diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index ddb3e64a4..9b173790c 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -55,18 +55,6 @@ Create_lockfile .lock
 # Checking depends
 Check_package chroot/usr/bin/xorriso xorriso
 
-case "${LB_PARENT_DISTRIBUTION}" in
-	wheezy)
-		_ISOHDPFX="/usr/lib/syslinux/isohdpfx.bin"
-		Check_package chroot/${_ISOHDPFX} syslinux-common
-		;;
-
-	*)
-		_ISOHDPFX="/usr/lib/ISOLINUX/isohdpfx.bin"
-		Check_package chroot/${_ISOHDPFX} isolinux
-		;;
-esac
-
 # Restoring cache
 Restore_cache cache/packages.binary
 
@@ -85,7 +73,7 @@ XORRISO_OPTIONS="-R -r -J -joliet-long -l -cache-inodes"
 # Handle xorriso live-build specific options
 if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ]
 then
-	XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr ${_ISOHDPFX} -partition_offset 16"
+	XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin -partition_offset 16"
 fi
 
 if [ "${_QUIET}" = "true" ]
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 568b3f757..e939cf4b4 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -120,34 +120,10 @@ else
 	fi
 fi
 
-# legacy compatibility for wheezy
-if [ -e "${_SOURCE}.${LB_PARENT_DISTRIBUTION}" ]
-then
-	_SOURCE="${_SOURCE}.${LB_PARENT_DISTRIBUTION}"
-fi
-
 # Checking depends
 case "${LB_BUILD_WITH_CHROOT}" in
 	true)
-		case "${LB_PARENT_DISTRIBUTION}" in
-			wheezy)
-				case "${_BOOTLOADER}" in
-					syslinux|extlinux)
-						Check_package chroot/usr/bin/${_BOOTLOADER} ${_BOOTLOADER}
-						;;
-
-					*)
-						Check_package chroot/usr/lib/syslinux syslinux-common
-						;;
-				esac
-				;;
-
-			*)
-				Check_package chroot/usr/lib/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER}
-				Check_package chroot/usr/lib/syslinux syslinux-common
-				;;
-		esac
-
+		Check_package chroot/usr/lib/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER}
 		Check_package chroot/usr/lib/syslinux syslinux-common
 
 		if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1
@@ -157,37 +133,11 @@ case "${LB_BUILD_WITH_CHROOT}" in
 		;;
 
 	false)
-		case "${LB_PARENT_DISTRIBUTION}" in
-			wheezy)
-				case "${_BOOTLOADER}" in
-					syslinux|extlinux)
-						if [ ! -e /usr/bin/${_BOOTLOADER} ]
-						then
-							# syslinux or extlinux
-							Echo_error "/usr/bin/${_BOOTLOADER} - no such file."
-							exit 1
-						fi
-						;;
-
-					*)
-						if ! ls /usr/lib/syslinux/${_BOOTLOADER}* > /dev/null 2>&1
-						then
-							Echo_error "/usr/lib/syslinux/${_BOOTLOADER}* - no such files."
-							exit 1
-						fi
-						;;
-				esac
-				;;
-
-			*)
-				if [ ! -e "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])" ]
-				then
-					Echo_error "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])"
-					exit 1
-				fi
-				;;
-		esac
-
+		if [ ! -e "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])" ]
+		then
+			Echo_error "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])"
+			exit 1
+		fi
 
 		if [ ! -e /usr/lib/syslinux ]
 		then
diff --git a/scripts/build/config b/scripts/build/config
index 0cf42ab68..3a7a2b701 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -1360,27 +1360,19 @@ then
 			echo "live-boot" > config/package-lists/live.list.chroot
 			echo "live-config" >> config/package-lists/live.list.chroot
 
-			case "${LB_PARENT_DISTRIBUTION}" in
-				wheezy)
-					echo "live-config-sysvinit" >> config/package-lists/live.list.chroot
+			case "${LB_INITSYSTEM}" in
+				none)
+					# do nothing
 					;;
 
-				*)
-					case "${LB_INITSYSTEM}" in
-						none)
-							# do nothing
-							;;
-
-						systemd)
-							echo "live-config-systemd" >> config/package-lists/live.list.chroot
-							echo "dbus" >> config/package-lists/live.list.chroot
-							;;
-
-						sysvinit|upstart)
-							echo "live-config-${LB_INITSYSTEM}" >> config/package-lists/live.list.chroot
-							echo "sysvinit-core" >> config/package-lists/live.list.chroot
-							;;
-					esac
+				systemd)
+					echo "live-config-systemd" >> config/package-lists/live.list.chroot
+					echo "dbus" >> config/package-lists/live.list.chroot
+					;;
+
+				sysvinit|upstart)
+					echo "live-config-${LB_INITSYSTEM}" >> config/package-lists/live.list.chroot
+					echo "sysvinit-core" >> config/package-lists/live.list.chroot
 					;;
 			esac
 			;;
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
index 5f6b3ca1d..65631326b 100755
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@@ -754,7 +754,7 @@ EOF
 	mv chroot/root/binary ./
 
 	case "${LB_PARENT_DISTRIBUTION}" in
-		wheezy)
+		jessie)
 			DISTRIBUTIONS="stable"
 			;;