Dropping support for squeeze and squeeze-based distributions.

8 files changed, 16 insertions, 72 deletions

diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
index e0e7d6639..43d4ad762 100755
--- a/scripts/build/binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -418,7 +418,7 @@ then
 
 		FIRMWARE_PACKAGES=""
 
-		if [ "${LB_PARENT_DISTRIBUTION}" = "squeeze" ] || [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ]
+		if [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ]
 		then
 			_CONTENTS="${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz"
 		else
@@ -445,7 +445,7 @@ then
 		then
 			# FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents).
 
-			if [ "${_PARENT_DISTRIBUTION}" = "squeeze" ] || [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ]
+			if [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ]
 			then
 				_CONTENTS="${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz"
 			else
diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd
index 4dd515fee..efa0d9909 100755
--- a/scripts/build/binary_hdd
+++ b/scripts/build/binary_hdd
@@ -50,15 +50,7 @@ case "${LB_BINARY_FILESYSTEM}" in
 		;;
 
 	ntfs)
-		case "${LB_PARENT_DISTRIBUTION}" in
-			squeeze)
-				Check_package chroot/sbin/mkfs.ntfs ntfsprogs
-				;;
-
-			*)
-				Check_package chroot/sbin/mkfs.nfts ntfs-3g
-				;;
-		esac
+		Check_package chroot/sbin/mkfs.nfts ntfs-3g
 		;;
 esac
 
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index 0b125764b..48c652878 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -357,8 +357,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 			esac
 		fi
 
-		if [ "${LB_PARENT_DISTRIBUTION}" != "squeeze" ] && \
-		   [ "${LB_MODE}" != "ubuntu" ]
+		if [ "${LB_MODE}" != "ubuntu" ] && [ "${LB_MODE}" != "kubuntu" ]
 		then
 			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
 		fi
diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap
index 9d964006f..13822c840 100755
--- a/scripts/build/bootstrap
+++ b/scripts/build/bootstrap
@@ -39,10 +39,3 @@ lb bootstrap_cache restore ${@}
 lb bootstrap_cdebootstrap ${@}
 lb bootstrap_debootstrap ${@}
 lb bootstrap_cache save ${@}
-
-# Temporary hack for base-files wrt/ plymouth
-case "${LB_DISTRIBUTION}" in
-	artax*)
-		echo '0.0.0' > chroot/etc/progress-linux_version
-		;;
-esac
diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt
index 3b1204982..18e7c66d2 100755
--- a/scripts/build/chroot_apt
+++ b/scripts/build/chroot_apt
@@ -204,19 +204,6 @@ cat >> chroot/etc/apt/preferences.d/progress-linux.pref << EOF
 EOF
 
 					done
-
-					# Add temporary hack to avoid squashfs version mismatch
-					case "${LB_DISTRIBUTION}" in
-						artax-backports)
-
-cat >> chroot/etc/apt/preferences.d/progress-linux.tmp.pref << EOF
-Package: squashfs-tools
-Pin: release n=squeeze
-Pin-Priority: 1001
-EOF
-
-						;;
-					esac
 				fi
 				;;
 		esac
@@ -322,9 +309,6 @@ EOF
 
 		fi
 
-		# Remove temporary hack to avoid squashfs version mismatch for artax-backports
-		rm -f chroot/etc/apt/preferences.d/progress-linux.tmp.pref
-
 		# Removing stage file
 		rm -f .build/chroot_apt
 		;;
diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks
index f0e885b08..f7d48ead1 100755
--- a/scripts/build/chroot_hacks
+++ b/scripts/build/chroot_hacks
@@ -38,22 +38,6 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-case "${LB_PARENT_DISTRIBUTION}" in
-	squeeze)
-		if echo "${LB_TASKS}" | grep -qs lxde ||
-			echo "${LB_TASKS}" | grep -qs xfce
-		then
-			GDM="gdm"
-		else
-			GDM="gdm3"
-		fi
-		;;
-
-	*)
-		GDM="gdm3"
-		;;
-esac
-
 # Handling default desktop configuration
 case "${LB_MODE}" in
 	debian*)
@@ -76,11 +60,11 @@ do
 			if [ -z "$(echo ${LB_TASKS} | sed -e 's|gnome-desktop||' -e 's| desktop ||' | grep desktop)" ]
 			then
 				# set display manager
-				echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed
+				echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed
 				Chroot chroot "debconf-set-selections /root/preseed"
 				rm -f chroot/root/preseed
-				Chroot chroot "dpkg-reconfigure ${GDM}"
-				echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager
+				Chroot chroot "dpkg-reconfigure gdm"
+				echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager
 
 				# set session manager
 				Chroot chroot "update-alternatives --set x-session-manager /usr/bin/gnome-session"
@@ -111,11 +95,11 @@ do
 			if [ -z "$(echo ${LB_TASKS} | sed -e 's|lxde-desktop||' -e 's| desktop ||' | grep desktop)" ]
 			then
 				# set display manager
-				echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed
+				echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed
 				Chroot chroot "debconf-set-selections /root/preseed"
 				rm -f chroot/root/preseed
-				Chroot chroot "dpkg-reconfigure ${GDM}"
-				echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager
+				Chroot chroot "dpkg-reconfigure gdm"
+				echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager
 
 				# set session manager
 				Chroot chroot "update-alternatives --set x-session-manager /usr/bin/startlxde"
@@ -127,11 +111,11 @@ do
 			if [ -z "$(echo ${LB_TASKS} | sed -e 's|xfce-desktop||' -e 's| desktop ||' | grep desktop)" ]
 			then
 				# set display manager
-				echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed
+				echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed
 				Chroot chroot "debconf-set-selections /root/preseed"
 				rm -f chroot/root/preseed
-				Chroot chroot "dpkg-reconfigure ${GDM}"
-				echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager
+				Chroot chroot "dpkg-reconfigure gdm"
+				echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager
 
 				# set session manager
 				Chroot chroot "update-alternatives --set x-session-manager /usr/bin/xfce4-session"
diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image
index 88244b69d..8ab9e6e30 100755
--- a/scripts/build/chroot_linux-image
+++ b/scripts/build/chroot_linux-image
@@ -63,7 +63,7 @@ then
 
 		FIRMWARE_PACKAGES=""
 
-		if [ "${LB_PARENT_DISTRIBUTION}" = "squeeze" ] || [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ]
+		if [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ]
 		then
 			_CONTENTS="${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz"
 		else
@@ -90,7 +90,7 @@ then
 		then
 			# FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents).
 
-			if [ "${_PARENT_DISTRIBUTION}" = "squeeze" ] || [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ]
+			if [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ]
 			then
 				_CONTENTS="${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz"
 			else
diff --git a/scripts/build/source_debian b/scripts/build/source_debian
index 95a155d88..61603f7f5 100755
--- a/scripts/build/source_debian
+++ b/scripts/build/source_debian
@@ -67,15 +67,7 @@ case "${LB_BINARY_FILESYSTEM}" in
 		;;
 
 	ntfs)
-		case "${LB_PARENT_DISTRIBUTION}" in
-			squeeze)
-				echo "ntfsprogs" >> source-selection.txt
-				;;
-
-			*)
-				echo "ntfs-3g" >> source-selection.txt
-				;;
-		esac
+		echo "ntfs-3g" >> source-selection.txt
 		;;
 esac