Removing kubuntu mode, it's not different anymore to standard ubuntu mode.

6 files changed, 12 insertions, 24 deletions

diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
index c72122f88..7e76f63f1 100755
--- a/scripts/build/binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -342,7 +342,7 @@ then
 			DI_REQ_PACKAGES="lilo grub grub-pc"
 
 			case "${LB_MODE}" in
-				ubuntu|kubuntu)
+				ubuntu)
 					DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
 					;;
 
@@ -356,7 +356,7 @@ then
 			DI_REQ_PACKAGES="elilo lilo grub grub-pc"
 
 			case "${LB_MODE}" in
-				ubuntu|kubuntu)
+				ubuntu)
 					case "${LB_DISTRIBUTION}" in
 						precise)
 							DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic-pae"
@@ -377,7 +377,7 @@ then
 		sparc)
 			DI_REQ_PACKAGES="silo"
 			case "${LB_MODE}" in
-				ubuntu|kubuntu)
+				ubuntu)
 					DI_PACKAGES="${DI_REQ_PACKAGES} linux-sparc64"
 					;;
 
@@ -390,7 +390,7 @@ then
 		powerpc)
 			DI_REQ_PACKAGES="yaboot"
 			case "${LB_MODE}" in
-				ubuntu|kubuntu)
+				ubuntu)
 					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc-smp linux-image-powerpc64-smp linux-image-powerpc-e500 linux-image-powerpc-e500mc"
 					;;
 
diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk
index c71338a90..8b7a43c3f 100755
--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@@ -66,12 +66,6 @@ case "${LB_MODE}" in
 		TRACE=""
 		;;
 
-	kubuntu)
-		TITLE="Kubuntu"
-		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 421a4502b..df70d605b 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -147,7 +147,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 				mv chroot/filesystem.${LB_CHROOT_FILESYSTEM} binary/${INITFS}
 
 				case "${LB_MODE}" in
-					ubuntu|kubuntu)
+					ubuntu)
 						du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
 						;;
 				esac
@@ -357,7 +357,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 			esac
 		fi
 
-		if [ "${LB_PARENT_DISTRIBUTION}" != "squeeze" ] && [ "${LB_MODE}" != "ubuntu" ] && [ "${LB_MODE}" != "kubuntu" ]
+		if [ "${LB_PARENT_DISTRIBUTION}" != "squeeze" ] && [ "${LB_MODE}" != "ubuntu" ]
 		then
 			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
 		fi
@@ -377,7 +377,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 				rm -f chroot/chroot/excludes
 
 				case "${LB_MODE}" in
-					ubuntu|kubuntu)
+					ubuntu)
 						du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
 						;;
 				esac
@@ -442,7 +442,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 				mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS}
 
 				case "${LB_MODE}" in
-					ubuntu|kubuntu)
+					ubuntu)
 						du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size
 						;;
 				esac
diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index da8417ef0..99433cf4c 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -131,7 +131,7 @@ EOF
 					fi
 					;;
 
-				ubuntu|kubuntu)
+				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" ]
@@ -196,7 +196,7 @@ EOF
 			do
 				# ubuntu workaround to allow using live.debian.net
 				case "${LB_MODE}" in
-					ubuntu|kubuntu)
+					ubuntu)
 						if [ "${REPOSITORY}" = "live.debian.net" ]
 						then
 							_DISTRIBUTION="sid"
@@ -701,7 +701,7 @@ EOF
 					fi
 					;;
 
-				ubuntu|kubuntu)
+				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" ]
diff --git a/scripts/build/config b/scripts/build/config
index 33429bb8d..4edb7cd86 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -100,7 +100,7 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--mirror-binary-updates URL]\n\
 \t    [--mirror-binary-backports URL]\n\
 \t    [--mirror-debian-installer URL]\n\
-\t    [--mode debian|emdebian|ubuntu|kubuntu]\n\
+\t    [--mode debian|emdebian|ubuntu]\n\
 \t    [--system live|normal]\n\
 \t    [--net-root-filesystem nfs|cfs]\n\
 \t    [--net-root-mountoptions OPTIONS]\n\
diff --git a/scripts/build/source_disk b/scripts/build/source_disk
index 380fdd599..caca200c2 100755
--- a/scripts/build/source_disk
+++ b/scripts/build/source_disk
@@ -66,12 +66,6 @@ case "${LB_MODE}" in
 		TRACE=""
 		;;
 
-	kubuntu)
-		TITLE="Kubuntu"
-		STRING="Build ${ARCHITECTURE}"
-		TRACE=""
-		;;
-
 	progress-linux)
 		TITLE="Progress Linux"
 		STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}"