From 5841e79b1fddb4e7aa340328a4df587398317d06 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Mon, 16 Nov 2009 12:40:43 +0100
Subject: Dropping etch support.

---
 helpers/lh_binary_debian-installer | 49 ++--------------------------
 helpers/lh_binary_grub             |  6 +---
 helpers/lh_binary_grub2            |  2 +-
 helpers/lh_binary_rootfs           | 21 ++----------
 helpers/lh_binary_silo             |  2 +-
 helpers/lh_binary_syslinux         | 66 ++------------------------------------
 helpers/lh_binary_win32-loader     | 59 ++++++++++++++++------------------
 helpers/lh_binary_yaboot           |  5 +--
 helpers/lh_chroot_hacks            |  6 ----
 9 files changed, 39 insertions(+), 177 deletions(-)

(limited to 'helpers')

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index daa927f33..046e1b488 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -85,12 +85,6 @@ case "${LH_BINARY_IMAGES}" in
 
 	tar|usb-hdd)
 		DESTDIR="binary/install"
-
-		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-		if [ "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" = "etch" ] && [ "${LH_BOOTLOADER}" = "syslinux" ]
-		then
-			DESTDIR="binary"
-		fi
 		;;
 
 	*)
@@ -138,12 +132,7 @@ case "${LH_ARCHITECTURE}" in
 		DI_REMOTE_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
 		DI_REMOTE_BASE_GTK="none"
 
-		if [ "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" = "etch" ]
-		then
-			DI_REMOTE_BASE="cdrom/2.6"
-		else
-			DI_REMOTE_BASE="cdrom"
-		fi
+		DI_REMOTE_BASE="cdrom"
 		;;
 	*)
 		case "${DI_IMAGE_TYPE}" in
@@ -236,22 +225,6 @@ VMLINUZ_GI="gtk/vmlinuz"
 INITRD_GI="gtk/initrd.gz"
 DESTDIR_GI="${DESTDIR}/gtk"
 
-# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-if [ "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" = "etch" ]
-then
-	case "${LH_BINARY_IMAGES}" in
-		usb-hdd|tar)
-			VMLINUZ_DI="vmlinuz.di"
-			INITRD_DI="initrddi.gz"
-			DESTDIR_DI="${DESTDIR}"
-
-			VMLINUZ_GI="vmlinuz.gi"
-			INITRD_GI="initrdgi.gz"
-			DESTDIR_GI="${DESTDIR}"
-			;;
-	esac
-fi
-
 if [ "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
 then
 	LH_DEBIAN_INSTALLER_DISTRIBUTION="sid"
@@ -297,13 +270,7 @@ if [ "${LH_ARCHITECTURE}" = "sparc" ] && [ "${DI_IMAGE_TYPE}" = "netboot" ]
 then
 	# There are no prepared kernel/initrd pairs for sparc netboot so we
 	# must unpack them from a mini.iso
-
-	if [ "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" = "etch" ]
-	then
-		Download_file mini.iso ${URL}/combined/2.6/mini.iso
-	else
-		Download_file mini.iso ${URL}/mini.iso
-	fi
+	Download_file mini.iso ${URL}/mini.iso
 
 	mkdir mini.tmp
 	${LH_ROOT_COMMAND} mount -o loop -t iso9660 mini.iso mini.tmp
@@ -367,21 +334,11 @@ then
 		sparc)
 			DI_REQ_PACKAGES="silo"
 			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-sparc64 linux-image-2.6-sparc64-smp"
-
-			if [ "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" = "etch" ]
-			then
-				DI_PACKAGES="${DI_PACKAGES} linux-image-2.6-sparc32"
-			fi
 			;;
 
 		powerpc)
 			DI_REQ_PACKAGES="yaboot"
 			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp"
-
-			if [ "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" = "etch" ]
-			then
-				DI_PACKAGES="${DI_PACKAGES} linux-image-2.6-prep"
-			fi
 			;;
 	esac
 
@@ -560,7 +517,7 @@ then
 	done < exclude
 
 	# Enable live-installer
-	if [ "${LH_DEBIAN_INSTALLER}" = "live" ] && [ "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" != "etch" ]
+	if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
 	then
 		# Remove local udebs
 		rm -f pool/main/b/base-installer/bootstrap-base_*.udeb
diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index 0d23ebb8d..a30aa3d1f 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -78,11 +78,7 @@ Grub_install_entry ()
 	INITRD="${3}"
 	APPEND="${4}"
 
-	# Boot in quiet mode where appropriate
-	if [ "${LH_DISTRIBUTION}" != "etch" ]
-	then
-		QAPPEND="quiet"
-	fi
+	QAPPEND="quiet"
 
 	for TYPE in Install Expert Rescue Auto
 	do
diff --git a/helpers/lh_binary_grub2 b/helpers/lh_binary_grub2
index 2946214d5..a04ad8f4c 100755
--- a/helpers/lh_binary_grub2
+++ b/helpers/lh_binary_grub2
@@ -79,7 +79,7 @@ Grub_install_entry ()
 	INITRD="${3}"
 	APPEND="${4}"
 
-	if [ "${LH_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
+	if [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
 	then
 		APPEND="${APPEND} quiet"
 	fi
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index aab7e5a57..749a6f44c 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -133,12 +133,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 		DU_DIM="$(du -ks chroot/chroot | cut -f1)"
 		REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_CHROOT_FILESYSTEM})"
 
-		if [ "${LH_DISTRIBUTION}" = "etch" ]
-		then
-			RESERVED_PERCENTAGE="--reserved-blocks"
-		else
-			RESERVED_PERCENTAGE="--reserved-percentage"
-		fi
+		RESERVED_PERCENTAGE="--reserved-percentage"
 
 		case "${LH_CHROOT_BUILD}" in
 			enabled)
@@ -301,10 +296,7 @@ case "${LH_CHROOT_FILESYSTEM}" in
 		# Remove stale squashfs image
 		rm -f chroot/filesystem.squashfs
 
-		if [ "${_QUIET}" = "enabled" ] && [ "${LH_DISTRIBUTION}" != "etch" ]
-		then
-			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress"
-		fi
+		MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress"
 
 		if [ "${_VERBOSE}" = "enabled" ]
 		then
@@ -366,15 +358,6 @@ case "${LH_CHROOT_FILESYSTEM}" in
 				if [ -f config/binary_rootfs/excludes ]
 				then
 					case "${LH_DISTRIBUTION}" in
-						etch)
-							MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -ef config/binary_rootfs/excludes"
-
-							if grep '*' config/binary_rootfs/excludes > /dev/null
-							then
-								Echo_warning "etch squashfs does not support wildcard excludes in config/binary_rootfs/excludes and are ignored. Please build in chrooted mode or adjust your exclude file."
-							fi
-							;;
-
 						lenny|sid)
 							MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef config/binary_rootfs/excludes"
 							;;
diff --git a/helpers/lh_binary_silo b/helpers/lh_binary_silo
index e3734c933..5dd768074 100755
--- a/helpers/lh_binary_silo
+++ b/helpers/lh_binary_silo
@@ -93,7 +93,7 @@ Silo_install_entry ()
 
 	DIRECTORY="/$(basename ${DESTDIR_INSTALL})"
 
-	if [ "${LH_DISTRIBUTION}" != "etch" ] && [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
+	if [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
 	then
 		APPEND="${APPEND} quiet"
 	fi
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 75d6cd51f..a6ad7e3f8 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -149,10 +149,7 @@ Syslinux_install_entry ()
 	APPEND="${4}"
 
 	# Boot in quiet mode where appropriate
-	if [ "${LH_DISTRIBUTION}" != "etch" ]
-	then
-		QAPPEND="quiet"
-	fi
+	QAPPEND="quiet"
 
 	for TYPE in Install Expert Rescue Auto
 	do
@@ -351,47 +348,6 @@ Configure_syslinux_templates ()
 			fi
 			;;
 	esac
-
-	# Syslinux v3.31 in etch does not support include statements
-	if [ "${LH_DISTRIBUTION}" = "etch" ]
-	then
-		while grep -qs ^include ${SCREEN_PATH}/syslinux.cfg
-		do
-			INCLUDES=$(grep ^include ${SCREEN_PATH}/syslinux.cfg | awk '{print $2}')
-
-			for FILE_PATH in ${INCLUDES}
-			do
-				FILE_NAME=$(basename ${FILE_PATH})
-
-				sed -i -e '\@include '${FILE_PATH}'@ {
-					r '${SCREEN_PATH}/${FILE_NAME}'
-					d
-				}' ${SCREEN_PATH}/syslinux.cfg
-
-				# remove the files, which were included
-				if [ -e ${SCREEN_PATH}/${FILE_NAME} ]
-				then
-					rm -f ${SCREEN_PATH}/${FILE_NAME}
-				fi
-			done
-		done
-
-		if [ -e ${SCREEN_PATH}/live.cfg ]
-		then
-			cat ${SCREEN_PATH}/live.cfg >> ${SCREEN_PATH}/syslinux.cfg
-			rm -f ${SCREEN_PATH}/live.cfg
-		fi
-
-		# Syslinux v3.31 in etch does not support sub directories, /path/kernel,
-		# when using FAT hard drive images, remove leading /'s
-		if [ "${LH_BINARY_IMAGES}" = "usb-hdd" ]
-		then
-			for FILE in ${SCREEN_PATH}/syslinux.cfg ${SCREEN_PATH}/boot.txt
-			do
-				sed -i -e 's|/||' ${FILE}
-			done
-		fi
-	fi
 }
 
 # Setting up common variables
@@ -440,21 +396,6 @@ case "${LH_BINARY_IMAGES}" in
 		LIVE_INSTALL_KERNEL_PATH="/install"
 		LIVE_SCREEN_PATH="/syslinux"
 		LIVE_DATA_PATH="${LIVE_SCREEN_PATH}"
-
-		# Syslinux v3.31 in etch does not support sub directories, /path/kernel,
-		# when using FAT hard drive images
-		if [ "${LH_DISTRIBUTION}" = "etch" ] && [ "${LH_BINARY_IMAGES}" = "usb-hdd" ]
-		then
-			SYSLINUX_PATH="binary"
-			KERNEL_PATH="binary"
-			SCREEN_PATH="binary"
-			DATA_PATH="binary"
-			LIVE_KERNEL_PATH=""
-			LIVE_INSTALL_KERNEL_PATH=""
-			LIVE_SCREEN_PATH=""
-			LIVE_DATA_PATH=""
-		fi
-
 		MEDIA="hd-media"
 		;;
 esac
@@ -679,10 +620,7 @@ case "${LH_BINARY_IMAGES}" in
 			sed -i -e "s|^include |include ${LIVE_SCREEN_PATH}/|g" "${FILE}"
 		done
 
-		if [ "${LH_DISTRIBUTION}" != "etch" ]
-		then
-			sed -i -e "s| f| ${LIVE_SCREEN_PATH}/f|g" ${SCREEN_PATH}/prompt.cfg
-		fi
+		sed -i -e "s| f| ${LIVE_SCREEN_PATH}/f|g" ${SCREEN_PATH}/prompt.cfg
 
 		mv ${SCREEN_PATH}/syslinux.cfg ${KERNEL_PATH}/pxelinux.cfg/default
 
diff --git a/helpers/lh_binary_win32-loader b/helpers/lh_binary_win32-loader
index d5a97e1ee..7eb7eea25 100755
--- a/helpers/lh_binary_win32-loader
+++ b/helpers/lh_binary_win32-loader
@@ -42,31 +42,29 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if [ "${LH_DISTRIBUTION}" != "etch" ]
-then
-	case "${LH_ARCHITECTURE}" in
-		amd64|i386|lpia)
-			if [ "${LH_CHROOT_BUILD}" = "enabled" ]
-			then
-				# Checking depends
-				Check_package chroot/usr/lib/win32-loader/win32-loader.exe win32-loader
+case "${LH_ARCHITECTURE}" in
+	amd64|i386|lpia)
+		if [ "${LH_CHROOT_BUILD}" = "enabled" ]
+		then
+			# Checking depends
+			Check_package chroot/usr/lib/win32-loader/win32-loader.exe win32-loader
 
-				# Restoring cache
-				Restore_cache cache/packages_binary
+			# Restoring cache
+			Restore_cache cache/packages_binary
 
-				# Installing depends
-				Install_package
+			# Installing depends
+			Install_package
 
-				# Copying win32-loader
-				cp chroot/usr/lib/win32-loader/* binary
-			else
-				cp /usr/lib/win32-loader/* binary
-			fi
+			# Copying win32-loader
+			cp chroot/usr/lib/win32-loader/* binary
+		else
+			cp /usr/lib/win32-loader/* binary
+		fi
 
-			mv binary/win32-loader.exe binary/setup.exe
+		mv binary/win32-loader.exe binary/setup.exe
 
-			if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
-			then
+		if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
+		then
 
 cat > binary/win32-loader.ini << EOF
 [installer]
@@ -81,20 +79,19 @@ g2ldr=g2ldr
 g2ldr.mbr=g2ldr.mbr
 EOF
 
-			fi
+		fi
 
-			# Saving cache
-			Save_cache cache/packages_binary
+		# Saving cache
+		Save_cache cache/packages_binary
 
-			# Removing depends
-			Remove_package
-			;;
+		# Removing depends
+		Remove_package
+		;;
 
-		*)
-			Echo_warning "win32-loader inclusion is enabled but not compatible with your architecture, ignoring."
-			;;
-	esac
-fi
+	*)
+		Echo_warning "win32-loader inclusion is enabled but not compatible with your architecture, ignoring."
+		;;
+esac
 
 # Creating stage file
 Create_stagefile .stage/binary_win32-loader
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot
index 6f528c190..d0e707c48 100755
--- a/helpers/lh_binary_yaboot
+++ b/helpers/lh_binary_yaboot
@@ -84,10 +84,7 @@ Yaboot_install_entry ()
 
 	DIRECTORY="/$(basename ${DESTDIR_INSTALL})"
 
-	if [ "${LH_DISTRIBUTION}" != "etch" ]
-	then
-		QAPPEND="quiet"
-	fi
+	QAPPEND="quiet"
 
 	for TYPE in Install Expert Rescue Auto
 	do
diff --git a/helpers/lh_chroot_hacks b/helpers/lh_chroot_hacks
index 5aa45a638..84e25671b 100755
--- a/helpers/lh_chroot_hacks
+++ b/helpers/lh_chroot_hacks
@@ -40,12 +40,6 @@ Create_lockfile .lock
 # Removing udev mac caching rule
 rm -f chroot/etc/udev/rules.d/*persistent-net.rules
 
-# Remove resume
-if [ "${LH_DISTRIBUTION}" = "etch" ] && [ -e /etc/initramfs-tools/conf.d/resume ]
-then
-	rm -f /etc/initramfs-tools/conf.d/resume
-fi
-
 case "${LH_BINARY_IMAGES}" in
 	net)
 		if [ ! -f chroot/usr/bin/smbmount ]
-- 
cgit v1.2.3