Dropping support for squeeze and squeeze-based distributions.

functions/defaults.sh

@@ -68,11 +68,6 @@ Set_defaults ()
 	case "${LB_MODE}" in
 		progress-linux)
 			case "${LB_DISTRIBUTION}" in
-				artax|artax-backports)
-					LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-squeeze}"
-					LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
-					;;
-
 				baureo|baureo-backports)
 					LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-wheezy}"
 					LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
@@ -204,15 +199,7 @@ Set_defaults ()
 			;;
 
 		progress-linux)
-			case "${LB_DISTRIBUTION}" in
+			LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}"
-				artax|artax-backports)
-					LB_INITSYSTEM="${LB_INITSYSTEM:-sysvinit}"
-					;;
-
-				*)
-					LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}"
-					;;
-			esac
 			;;
 
 		*)
@@ -281,15 +268,7 @@ Set_defaults ()
 	fi
 
 	# Setting tasksel
-	case "${LB_PARENT_DISTRIBUTION}" in
+	LB_TASKSEL="${LB_TASKSEL:-apt}"
-		squeeze)
-			LB_TASKSEL="${LB_TASKSEL:-tasksel}"
-			;;
-
-		*)
-			LB_TASKSEL="${LB_TASKSEL:-apt}"
-			;;
-	esac
 
 	# Setting root directory
 	case "${LB_MODE}" in
@@ -696,15 +675,7 @@ Set_defaults ()
 		i386)
 			case "${LB_MODE}" in
 				progress-linux)
-					case "${LB_DISTRIBUTION}" in
+					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686-pae}"
-						artax)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686}"
-							;;
-
-						*)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686-pae}"
-							;;
-					esac
 					;;
 
 				ubuntu|kubuntu)
@@ -725,15 +696,7 @@ Set_defaults ()
 							;;
 
 						*)
-							case "${LB_PARENT_DISTRIBUTION}" in
+							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686-pae}"
-								squeeze)
-									LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686}"
-									;;
-
-								*)
-									LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686-pae}"
-									;;
-							esac
 							;;
 					esac
 					;;
@@ -825,15 +788,7 @@ Set_defaults ()
 			;;
 
 		*)
-			case "${LB_PARENT_DISTRIBUTION}" in
+			LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image}"
-				squeeze)
-					LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image-2.6}"
-					;;
-
-				*)
-					LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image}"
-					;;
-			esac
 			;;
 	esac
 

functions/releases.sh

@@ -9,13 +9,11 @@
 
 
 # Debian releases
-RELEASE_squeeze="6.0.6"
 RELEASE_wheezy="7.0~a2"
 RELEASE_jessie="8"
 RELEASE_sid="unstable"
 
 # Progress Linux releases
-RELEASE_artax="1.0"
 RELEASE_baureo="2.0"
 RELEASE_charon="unstable"
 

manpages/de/lb_config.de.1

@@ -252,7 +252,7 @@ directory where \fBlb config\fP was executed.
 .\" FIXME
 Note: Currently \fBlb config\fP tries to be smart and sets defaults for some
 options depending on the setting of other options (e.g. which linux packages
-to be used depending on if a squeeze system gets build or not). This means
+to be used depending on if a wheezy system gets build or not). This means
 that when generating a new configuration, you should call \fBlb config\fP only
 once with all options specified. Calling it several times with only a subset
 of the options each can result in non working configurations. This is also
@@ -732,7 +732,7 @@ created. Default is 512MB.
 defines the syslinux theme to use. The theme suffix is the name of a
 directory in /usr/share/syslinux/themes/ provided by a package named
 syslinux\-theme\- plus the suffix. In debian mode, this defaults to
-debian\-squeeze.
+debian\-wheezy.
 .IP "\fB\-\-tasksel\fP apt|aptitude|tasksel" 4
 selects which program is used to install tasks. By default, this is set to
 tasksel.

manpages/en/lb_config.1

@@ -240,7 +240,7 @@
 .\" FIXME
 \fBlb config\fR populates the configuration directory for live\-build. By default, this directory is named 'config' and is created in the current directory where \fBlb config\fR was executed.
 .PP
-Note: Currently \fBlb config\fR tries to be smart and sets defaults for some options depending on the setting of other options (e.g. which linux packages to be used depending on if a squeeze system gets build or not). This means that when generating a new configuration, you should call \fBlb config\fR only once with all options specified. Calling it several times with only a subset of the options each can result in non working configurations. This is also caused by the fact that \fBlb config\fR called with one option only changes that option, and leaves everything else as is unless its not defined. However, \fBlb config\fR does warn about know impossible or likely impossible combinations that would lead to non working live systems. If unsure, remove config/{binary,bootstrap,chroot,common,source} and call \fBlb config\fR again.
+Note: Currently \fBlb config\fR tries to be smart and sets defaults for some options depending on the setting of other options (e.g. which linux packages to be used depending on if a wheezy system gets build or not). This means that when generating a new configuration, you should call \fBlb config\fR only once with all options specified. Calling it several times with only a subset of the options each can result in non working configurations. This is also caused by the fact that \fBlb config\fR called with one option only changes that option, and leaves everything else as is unless its not defined. However, \fBlb config\fR does warn about know impossible or likely impossible combinations that would lead to non working live systems. If unsure, remove config/{binary,bootstrap,chroot,common,source} and call \fBlb config\fR again.
 .\" FIXME
 
 .SH OPTIONS
@@ -463,7 +463,7 @@ defines the path to a swap file to create in the binary image. Default is not to
 .IP "\fB\-\-swap\-file\-size\fR \fIMB\fR" 4
 defines what size in megabytes the swap file should be, if one is to be created. Default is 512MB.
 .IP "\fB\-\-syslinux\-theme\fR \fITHEME_SUFFIX\fR" 4
-defines the syslinux theme to use. The theme suffix is the name of a directory in /usr/share/syslinux/themes/ provided by a package named syslinux\-theme\- plus the suffix. In debian mode, this defaults to debian\-squeeze.
+defines the syslinux theme to use. The theme suffix is the name of a directory in /usr/share/syslinux/themes/ provided by a package named syslinux\-theme\- plus the suffix. In debian mode, this defaults to debian\-wheezy.
 .IP "\fB\-\-tasksel\fR apt|aptitude|tasksel" 4
 selects which program is used to install tasks. By default, this is set to tasksel.
 .IP "\fB\-\-templates\fR \fIPATH\fR" 4

manpages/po/de/lb_config.1.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2012-11-30 15:16+0100\n"
 "PO-Revision-Date: 2012-08-02 18:55+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -766,7 +766,7 @@ msgstr ""
 msgid ""
 "Note: Currently B<lb config> tries to be smart and sets defaults for some "
 "options depending on the setting of other options (e.g. which linux packages "
-"to be used depending on if a squeeze system gets build or not). This means "
+"to be used depending on if a wheezy system gets build or not). This means "
 "that when generating a new configuration, you should call B<lb config> only "
 "once with all options specified. Calling it several times with only a subset "
 "of the options each can result in non working configurations. This is also "
@@ -2294,7 +2294,7 @@ msgid ""
 "defines the syslinux theme to use. The theme suffix is the name of a "
 "directory in /usr/share/syslinux/themes/ provided by a package named "
 "syslinux-theme- plus the suffix. In debian mode, this defaults to debian-"
-"squeeze."
+"wheezy."
 msgstr ""
 
 #. type: IP

manpages/pot/lb_config.1.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2012-11-30 15:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -766,7 +766,7 @@ msgstr ""
 msgid ""
 "Note: Currently B<lb config> tries to be smart and sets defaults for some "
 "options depending on the setting of other options (e.g. which linux packages "
-"to be used depending on if a squeeze system gets build or not). This means "
+"to be used depending on if a wheezy system gets build or not). This means "
 "that when generating a new configuration, you should call B<lb config> only "
 "once with all options specified. Calling it several times with only a subset "
 "of the options each can result in non working configurations. This is also "
@@ -2294,7 +2294,7 @@ msgid ""
 "defines the syslinux theme to use. The theme suffix is the name of a "
 "directory in /usr/share/syslinux/themes/ provided by a package named "
 "syslinux-theme- plus the suffix. In debian mode, this defaults to debian-"
-"squeeze."
+"wheezy."
 msgstr ""
 
 #. type: IP

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

scripts/build/binary_hdd

@@ -50,15 +50,7 @@ case "${LB_BINARY_FILESYSTEM}" in
 		;;
 
 	ntfs)
-		case "${LB_PARENT_DISTRIBUTION}" in
+		Check_package chroot/sbin/mkfs.nfts ntfs-3g
-			squeeze)
-				Check_package chroot/sbin/mkfs.ntfs ntfsprogs
-				;;
-
-			*)
-				Check_package chroot/sbin/mkfs.nfts ntfs-3g
-				;;
-		esac
 		;;
 esac
 

scripts/build/binary_rootfs

@@ -357,8 +357,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 			esac
 		fi
 
-		if [ "${LB_PARENT_DISTRIBUTION}" != "squeeze" ] && \
+		if [ "${LB_MODE}" != "ubuntu" ] && [ "${LB_MODE}" != "kubuntu" ]
-		   [ "${LB_MODE}" != "ubuntu" ]
 		then
 			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
 		fi

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

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
 		;;

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}"
+				Chroot chroot "dpkg-reconfigure gdm"
-				echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager
+				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}"
+				Chroot chroot "dpkg-reconfigure gdm"
-				echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager
+				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}"
+				Chroot chroot "dpkg-reconfigure gdm"
-				echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager
+				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"

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

scripts/build/source_debian

@@ -67,15 +67,7 @@ case "${LB_BINARY_FILESYSTEM}" in
 		;;
 
 	ntfs)
-		case "${LB_PARENT_DISTRIBUTION}" in
+		echo "ntfs-3g" >> source-selection.txt
-			squeeze)
-				echo "ntfsprogs" >> source-selection.txt
-				;;
-
-			*)
-				echo "ntfs-3g" >> source-selection.txt
-				;;
-		esac
 		;;
 esac
 

templates/cgi/debian/form.html

@@ -37,8 +37,7 @@
 			<td><label for="Distribution">--distribution:</label> </td>
 			<td>
 				<select id="Distribution" name="distribution" size="1">
-					<option selected value="squeeze">squeeze</option>
+					<option selected value="wheezy">wheezy</option>
-					<option value="wheezy">wheezy</option>
 					<option value="sid">sid</option>
 				</select>
 			</td>