Dropping automagics for ubuntu.

Future live-build versions will still allow to use casper,
but its configuration will be done differently by a custom
config tree, rather than embedded and maintenance intensive
code in live-build itself.

8 files changed, 8 insertions, 100 deletions

diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk
index 066f4f135..4f444b0be 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"
 		;;
 
-	ubuntu)
-		TITLE="Ubuntu"
-		STRING="Build ${ARCHITECTURE}"
-		TRACE=""
-		;;
-
 	progress-linux)
 		TITLE="Progress Linux"
 		STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}"
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index ba2f49a22..f4fa0f67e 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -137,11 +137,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 				# Move image
 				mv chroot/filesystem.${LB_CHROOT_FILESYSTEM} binary/${INITFS}
 
-				case "${LB_MODE}" in
-					ubuntu)
-						du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
-						;;
-				esac
+				du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
 
 				if [ -e chroot/chroot.cache ]
 				then
@@ -348,10 +344,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 			esac
 		fi
 
-		if [ "${LB_MODE}" != "ubuntu" ]
-		then
-			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
-		fi
+		MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
 
 		case "${LB_BUILD_WITH_CHROOT}" in
 			true)
@@ -367,11 +360,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 
 				rm -f chroot/chroot/excludes
 
-				case "${LB_MODE}" in
-					ubuntu)
-						du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
-						;;
-				esac
+				du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
 
 				# Move image
 				mv chroot/filesystem.squashfs binary/${INITFS}
@@ -432,11 +421,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 
 				mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS}
 
-				case "${LB_MODE}" in
-					ubuntu)
-						du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size
-						;;
-				esac
+				du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size
 				;;
 		esac
 
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader
index 99adc0d0d..eecb6b263 100755
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -48,10 +48,6 @@ case "${LB_MODE}" in
 		RUN_LABEL="Run Progress Linux"
 		;;
 
-	ubuntu)
-		RUN_LABEL="Run Ubuntu"
-		;;
-
 	*)
 		RUN_LABEL="Run Debian GNU/Linux"
 		;;
diff --git a/scripts/build/bootstrap_archives b/scripts/build/bootstrap_archives
index 56a3d4c33..2bc127b35 100755
--- a/scripts/build/bootstrap_archives
+++ b/scripts/build/bootstrap_archives
@@ -126,15 +126,6 @@ then
 				fi
 			fi
 			;;
-
-		ubuntu)
-			echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
-
-			if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
-			then
-				echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
-			fi
-			;;
 	esac
 fi
 
diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index a5c589a92..a52a44d22 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -127,15 +127,6 @@ EOF
 						fi
 					fi
 					;;
-
-				ubuntu)
-					echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
-
-					if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
-					then
-						echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
-					fi
-					;;
 			esac
 		fi
 
@@ -625,15 +616,6 @@ EOF
 						fi
 					fi
 					;;
-
-				ubuntu)
-					echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
-
-					if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
-					then
-						echo "deb-src ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE}
-					fi
-					;;
 			esac
 		fi
 
diff --git a/scripts/build/config b/scripts/build/config
index e526d9276..633590cba 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -91,7 +91,7 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--mirror-binary URL]\n\
 \t    [--mirror-binary-security URL]\n\
 \t    [--mirror-debian-installer URL]\n\
-\t    [--mode debian|ubuntu]\n\
+\t    [--mode debian]\n\
 \t    [--system live|normal]\n\
 \t    [--net-root-filesystem nfs|cfs]\n\
 \t    [--net-root-mountoptions OPTIONS]\n\
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer
index ed1adf411..8b09ec08f 100755
--- a/scripts/build/installer_debian-installer
+++ b/scripts/build/installer_debian-installer
@@ -317,51 +317,17 @@ then
 	case "${LB_ARCHITECTURES}" in
 		amd64)
 			DI_REQ_PACKAGES="lilo grub-pc"
-
-			case "${LB_MODE}" in
-				ubuntu)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
-					;;
-
-				*)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-amd64"
-					;;
-			esac
+			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-amd64"
 			;;
 
 		i386)
 			DI_REQ_PACKAGES="elilo lilo grub-pc"
-
-			case "${LB_MODE}" in
-				ubuntu)
-					case "${LB_DISTRIBUTION}" in
-						precise)
-							DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic-pae"
-							;;
-
-						*)
-							DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
-							;;
-					esac
-					;;
-
-				*)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-586 linux-image-686-pae"
-					;;
-			esac
+			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-586 linux-image-686-pae"
 			;;
 
 		powerpc)
 			DI_REQ_PACKAGES="yaboot"
-			case "${LB_MODE}" in
-				ubuntu)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc-smp linux-image-powerpc64-smp linux-image-powerpc-e500 linux-image-powerpc-e500mc"
-					;;
-
-				*)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64 linux-image-powerpc-smp"
-					;;
-			esac
+			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64 linux-image-powerpc-smp"
 			;;
 	esac
 
diff --git a/scripts/build/source_disk b/scripts/build/source_disk
index 4f773f06d..6cf99e0c0 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"
 		;;
 
-	ubuntu)
-		TITLE="Ubuntu"
-		STRING="Build ${ARCHITECTURE}"
-		TRACE=""
-		;;
-
 	progress-linux)
 		TITLE="Progress Linux"
 		STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}"