Merge branch 'dead-ubuntu-touch' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master

debian/changelog

@@ -5,6 +5,7 @@ livecd-rootfs (2.590) UNRELEASED; urgency=medium
   * Drop old arm platforms.
   * Drop ubuntu-desktop-next configs  
   * Drop ubuntu-desktop-next hooks
+  * Drop ubuntu-touch configs
 
  -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 30 May 2019 11:04:02 +0100
 

debian/tests/default-bootstraps

@@ -43,8 +43,6 @@ ALL_TRIPLETS="
  ubuntu-server::
  ubuntu-server:ubuntu-rtm:
  ubuntu-server:ubuntu-rtm/foo:
- ubuntu-touch-custom::ubuntu-touch-custom
- ubuntu-touch::ubuntu-touch
  xubuntu::"
 
 if [ -z "$SELECTED_TRIPLETS" ]; then

live-build/auto/build

@@ -393,14 +393,6 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS
 				;;
 		esac
 
-		if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
-			if [ "$ARCH" = "armhf" ]; then
-				INFO_DESC="$(lsb_release -d -s)"
-				echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/etc/media-info
-				mkdir -p chroot/var/log/installer
-				Chroot chroot "ln -s /etc/media-info /var/log/installer/media-info"
-			fi
-		fi
 		if [ "$PROJECT" = "ubuntu-cpc" ]; then
 			if [ "${SUBPROJECT:-}" = minimized ]; then
 				BUILD_NAME=minimal
@@ -517,12 +509,6 @@ EOF
     fi
 fi
 
-if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
-	(cd "binary/$INITFS/custom.dir/" && tar -c --sort=name --xattrs *) | \
-		gzip -9 --rsyncable > "$PREFIX.custom.tar.gz"
-	chmod 644 "$PREFIX.custom.tar.gz"
-fi
-
 # '--initramfs none' produces different manifest names.
 if [ -e "binary/$INITFS/filesystem.packages" ]; then
 	./config/snap-seed-parse "chroot/" "binary/${INITFS}/filesystem.packages"
@@ -854,66 +840,6 @@ case $SUBARCH in
 		;;
 esac
 
-if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then
-	sourceslist="chroot/etc/apt/sources.list"
-
-	lb chroot_proc install "$@"
-	lb chroot_sysfs install "$@"
-	lb chroot_devpts install "$@"
-
-	if [ -e "$PREFIX.manifest" ]; then
-		 Chroot chroot "click list" | while read line; do
-			 echo "click:$line" >>"$PREFIX.manifest"
-		 done
-	fi
-
-	if [ -e chroot/etc/resolv.conf ]; then
-		mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig
-	fi
-	if [ -e /etc/resolv.conf ]; then
-		cp /etc/resolv.conf chroot/etc/resolv.conf
-	fi
-
-	mv "${sourceslist}" "${sourceslist}.orig"
-	mv "${sourceslist}.d" "${sourceslist}.d.orig"
-	echo "deb $LB_PARENT_MIRROR_CHROOT ${LB_DISTRIBUTION} main universe multiverse restricted" >$sourceslist
-	Chroot chroot "apt-get -y update"
-	Chroot chroot "apt-get -y install android"
-
-	if [ "$ARCH" = "armhf" ]; then
-		touchsubarches="flo mako generic"
-		for subarch in $touchsubarches; do
-			cp -v chroot/usr/share/android/product/*-preinstalled-system-armel+${subarch}.img\
-				"${PREFIX}.system-armel+${subarch}.img"
-			cp -v chroot/usr/share/android/product/*-preinstalled-recovery-armel+${subarch}.img\
-				"${PREFIX}.recovery-armel+${subarch}.img"
-			cp -v chroot/usr/share/android/product/*-preinstalled-boot-armhf+${subarch}.img\
-				"${PREFIX}.boot-armhf+${subarch}.img"
-			# drop this following line once cdimage can handle -boot-*.img
-			cp -v "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}"
-		done
-	fi
-	if [ "$ARCH" = "i386" ]; then
-		touchsubarches="generic_x86"
-		for subarch in $touchsubarches; do
-			cp -v chroot/usr/share/android/product/*-preinstalled-system-i386+${subarch}.img\
-				"${PREFIX}.system-i386+${subarch}.img"
-			cp -v chroot/usr/share/android/product/*-preinstalled-recovery-i386+${subarch}.img\
-				"${PREFIX}.recovery-i386+${subarch}.img"
-			cp -v chroot/usr/share/android/product/*-preinstalled-boot-i386+${subarch}.img\
-				"${PREFIX}.boot-i386+${subarch}.img"
-			# drop this following line once cdimage can handle -boot-*.img
-			cp -v "${PREFIX}.boot-i386+${subarch}.img" "${PREFIX}.bootimg-${subarch}"
-		done
-	fi
-
-	lb chroot_devpts remove "$@"
-	lb chroot_sysfs remove "$@"
-	lb chroot_proc remove "$@"
-
-	rm -rf chroot/etc/init/*.override
-fi
-
 # LTSP chroot building (only in 32bit and for Edubuntu (DVD))
 case $PROJECT in
 	edubuntu-dvd)

live-build/auto/config

@@ -404,7 +404,7 @@ case $IMAGEFORMAT in
 		;;
 	*)
 		case $PROJECT in
-			ubuntu-server|ubuntu-touch|ubuntu-touch-custom)
+			ubuntu-server)
 				;;
 			ubuntu)
 				if [ "$SUBPROJECT" != "canary" ]; then
@@ -442,7 +442,7 @@ if [ "$PREINSTALLED" = "true" ]; then
 		ubuntu-server)
 			add_package live oem-config-debconf ubiquity-frontend-debconf
 			;;
-		ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-touch-custom|ubuntu-cpc)
+		ubuntu-core|ubuntu-base|base|ubuntu-cpc)
 			;;
 		*)
 			add_package live oem-config-gtk ubiquity-frontend-gtk
@@ -741,44 +741,6 @@ case $PROJECT in
 		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 		;;
 
-	ubuntu-touch|ubuntu-touch-custom)
-		HINTS="packagekit ubuntu-system-settings"
-		case $ARCH in
-		    amd64|i386)
-			HINTS="$HINTS qml-module-ubuntu-components-gles unity8"
-			;;
-		esac
-		add_package install ubuntu-minimal ubuntu-touch $HINTS
-
-		COMPONENTS='main restricted universe'
-		BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu'
-		export LB_BOOTSTRAP_INCLUDE='apt-transport-https gnupg'
-		OPTS="${OPTS:+$OPTS }--apt-recommends false"
-		OPTS="${OPTS:+$OPTS }--compression gzip"
-		OPTS="${OPTS:+$OPTS }--system normal"
-		OPTS="${OPTS:+$OPTS }--zsync false"
-
-		# TODO cjwatson 2014-07-17: This is a bit of an abuse of
-		# SUBPROJECT, but it's a handy thing that launchpad-buildd
-		# already passes through to us that we weren't otherwise
-		# using here.
-		case ${SUBPROJECT:-} in
-		    ubuntu-rtm/dogfood)
-			MIRROR=http://derived-archive.dogfood.content.paddev.net/ubuntu-rtm/
-			OPTS="${OPTS:+$OPTS }--apt-secure false"
-			OPTS="${OPTS:+$OPTS }--mirror-chroot-security ${MIRROR}"
-			OPTS="${OPTS:+$OPTS }--mirror-binary-security ${MIRROR}"
-			OPTS="${OPTS:+$OPTS }--mirror-binary ${MIRROR}"
-			;;
-		    ubuntu-rtm)
-			MIRROR=http://derived.archive.canonical.com/ubuntu-rtm/
-			OPTS="${OPTS:+$OPTS }--mirror-chroot-security ${MIRROR}"
-			OPTS="${OPTS:+$OPTS }--mirror-binary-security ${MIRROR}"
-			OPTS="${OPTS:+$OPTS }--mirror-binary ${MIRROR}"
-			;;
-		esac
-		;;
-
 	ubuntu-cpc)
 		if [ "${SUBPROJECT:-}" = minimized ]; then
 			add_task install cloud-image
@@ -943,7 +905,7 @@ case $ARCH in
 esac
 
 case $PROJECT:${SUBPROJECT:-} in
-	ubuntu-server:*|ubuntu-base:*|ubuntu-touch:*|ubuntu-touch-custom:*)
+	ubuntu-server:*|ubuntu-base:*)
 		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
 		KERNEL_FLAVOURS=none
 		BINARY_REMOVE_LINUX=false
@@ -1135,7 +1097,7 @@ EOF
 		fi
 		;;
 
-	ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-cpc:*|ubuntu-server:live)
+	ubuntu-core:system-image|ubuntu-cpc:*|ubuntu-server:live)
 		cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
 			config/