Adding kubuntu mode in order to have different defadefault hooks enabled for ubuntu and kubuntu (needed for #630088).

7 files changed, 39 insertions, 19 deletions

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index b193151ac..41376f7af 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -303,7 +303,7 @@ then
 			DI_REQ_PACKAGES="lilo grub"
 
 			case "${LB_MODE}" in
-				ubuntu)
+				ubuntu|kubuntu)
 					DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
 					;;
 
@@ -318,7 +318,7 @@ then
 			DI_REQ_PACKAGES="elilo lilo grub"
 
 			case "${LB_MODE}" in
-				ubuntu)
+				ubuntu|kubuntu)
 					DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
 					;;
 
@@ -331,7 +331,7 @@ then
 		sparc)
 			DI_REQ_PACKAGES="silo"
 			case "${LB_MODE}" in
-				ubuntu)
+				ubuntu|kubuntu)
 					DI_PACKAGES="${DI_REQ_PACKAGES} linux-sparc64"
 					;;
 
@@ -344,7 +344,7 @@ then
 		powerpc)
 			DI_REQ_PACKAGES="yaboot"
 			case "${LB_MODE}" in
-				ubuntu)
+				ubuntu|kubuntu)
 					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64-smp"
 					;;
 
diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk
index 145a0c261..a28a0fe92 100755
--- a/scripts/build/lb_binary_disk
+++ b/scripts/build/lb_binary_disk
@@ -66,6 +66,12 @@ case "${LB_MODE}" in
 		TRACE=""
 		;;
 
+	kubuntu)
+		TITLE="Kubuntu"
+		STRING="Build ${ARCHITECTURE}"
+		TRACE=""
+		;;
+
 	*)
 		STRING="Snapshot ${ARCHITECTURE}"
 		TRACE=""
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 663f21212..6f5ed21a9 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -135,7 +135,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 				mv chroot/filesystem.${LB_CHROOT_FILESYSTEM} binary/${INITFS}
 
 				case "${LB_MODE}" in
-					ubuntu)
+					ubuntu|kubuntu)
 						du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
 						;;
 				esac
@@ -366,7 +366,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 				rm -f chroot/chroot/excludes
 
 				case "${LB_MODE}" in
-					ubuntu)
+					ubuntu|kubuntu)
 						du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
 						;;
 				esac
@@ -431,7 +431,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 				mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS}
 
 				case "${LB_MODE}" in
-					ubuntu)
+					ubuntu|kubuntu)
 						du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size
 						;;
 				esac
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 4b65365d5..d5dedb43a 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -136,7 +136,7 @@ EOF
 					fi
 					;;
 
-				ubuntu)
+				ubuntu|kubuntu)
 					echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
 					if [ "${LB_SOURCE}" = "true" ]
@@ -150,7 +150,7 @@ EOF
 		if [ "${LB_VOLATILE}" = "true" ]
 		then
 			case "${LB_MODE}" in
-				debian|ubuntu)
+				debian|ubuntu|kubuntu)
 					echo "deb ${LB_PARENT_MIRROR_CHROOT_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
 					if [ "${LB_SOURCE}" = "true" ]
@@ -204,12 +204,20 @@ EOF
 			for REPOSITORY in ${LB_ARCHIVES}
 			do
 				# ubuntu workaround to allow using live.debian.net
-				if [ "${LB_MODE}" = "ubuntu" ] && [ "${REPOSITORY}" = "live.debian.net" ]
-				then
-					_DISTRIBUTION="sid"
-				else
-					_DISTRIBUTION="${LB_PARENT_DISTRIBUTION}"
-				fi
+				case "${LB_MODE}" in
+					ubuntu|kubuntu)
+						if [ "${REPOSITORY}" = "live.debian.net" ]
+						then
+							_DISTRIBUTION="sid"
+						else
+							_DISTRIBUTION="${LB_PARENT_DISTRIBUTION}"
+						fi
+						;;
+
+					*)
+						_DISTRIBUTION="${LB_PARENT_DISTRIBUTION}"
+						;;
+				esac
 
 				# Prefer archives from the config tree
 				# over the global ones.
@@ -660,7 +668,7 @@ EOF
 					fi
 					;;
 
-				ubuntu)
+				ubuntu|kubuntu)
 					echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
 					if [ "${LB_SOURCE}" = "true" ]
@@ -674,7 +682,7 @@ EOF
 		if [ "${LB_VOLATILE}" = "true" ]
 		then
 			case "${LB_MODE}" in
-				debian|ubuntu)
+				debian|ubuntu|kubuntu)
 					echo "deb ${LB_PARENT_MIRROR_BINARY_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
 
 					if [ "${LB_SOURCE}" = "true" ]
diff --git a/scripts/build/lb_chroot_task-lists b/scripts/build/lb_chroot_task-lists
index 82aa225ea..2bdffd8d5 100755
--- a/scripts/build/lb_chroot_task-lists
+++ b/scripts/build/lb_chroot_task-lists
@@ -82,7 +82,7 @@ then
 			APT_TASKS=
 
 			case "${LB_MODE}" in
-				ubuntu)
+				ubuntu|kubuntu)
 					TASKS="$(cat chroot/root/chroot_tasks)"
 					;;
 
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 6c464ef92..ad144aa3b 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -112,7 +112,7 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--mirror-binary-volatile URL]\n\
 \t    [--mirror-binary-backports URL]\n\
 \t    [--mirror-debian-installer URL]\n\
-\t    [--mode debian|emdebian|ubuntu]\n\
+\t    [--mode debian|emdebian|ubuntu|kubuntu]\n\
 \t    [--net-root-filesystem nfs|cfs]\n\
 \t    [--net-root-mountoptions OPTIONS]\n\
 \t    [--net-root-path PATH]\n\
diff --git a/scripts/build/lb_source_disk b/scripts/build/lb_source_disk
index 3d21223c6..3a93d247a 100755
--- a/scripts/build/lb_source_disk
+++ b/scripts/build/lb_source_disk
@@ -66,6 +66,12 @@ case "${LB_MODE}" in
 		TRACE=""
 		;;
 
+	kubuntu)
+		TITLE="Kubuntu"
+		STRING="Build ${ARCHITECTURE}"
+		TRACE=""
+		;;
+
 	*)
 		STRING="Snapshot ${ARCHITECTURE}"
 		TRACE=""