Merge lp:~rbalint/livecd-rootfs/drop-nexus7-support

debian/changelog

@@ -2,8 +2,10 @@ livecd-rootfs (2.489) UNRELEASED; urgency=medium
 
   * Revert to building minimized and not minimimized images with the same
     ~2.2 GiB size
+  * Stop suggesting partimage which is not used anymore
+  * Drop Nexus 7 support
 
- -- Balint Reczey <rbalint@ubuntu.com>  Thu, 04 Jan 2018 14:37:51 +0100
+ -- Balint Reczey <rbalint@ubuntu.com>  Sat, 06 Jan 2018 23:49:15 +0100
 
 livecd-rootfs (2.488) bionic; urgency=medium
 

debian/control

@@ -35,7 +35,6 @@ Depends: ${misc:Depends},
          vmdk-stream-converter [amd64 i386],
          xz-utils,
          zerofree
-Suggests: partimage
 Breaks: ubuntu-defaults-builder (<< 0.32)
 Description: construction script for the livecd rootfs
  livecd-rootfs provides the script used to create the root filesystem

live-build/auto/build

@@ -835,7 +835,7 @@ if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
 	fi
 fi
 
-if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
+if [ "$SUBARCH" = "ac100" ]; then
 	# create the md5sum and size files for which we are actually doing all this
 	md5sum $PREFIX.rootfs.tar.gz >chroot/installer.md5
 	wc -c $PREFIX.rootfs.tar.gz >chroot/installer.size
@@ -856,16 +856,6 @@ if [ "$SUBARCH" = "ac100" ] || [ "$SUBARCH" = "nexus7" ]; then
 	# create boot.img
 	Chroot chroot "abootimg --create /boot/installer-${KVERS}.img -f /boot/bootimg.cfg-$SUBARCH -r /boot/initrd.img-${KVERS} -k /boot/vmlinuz-${KVERS}"
 
-	if [ "$SUBARCH" = "nexus7" ]; then
-		# roll the android rootfs images
-		mkdir -p userdata
-		mv $PREFIX.rootfs.tar.gz userdata/rootfs.tar.gz
-		apt-get -y install android-tools-fsutils
-		make_ext4fs -l 6G -s $PREFIX.ext4-$FLAVOUR userdata/
-		mv userdata/rootfs.tar.gz $PREFIX.rootfs.tar.gz
-		ln -sf "$PREFIX.ext4-$FLAVOUR" "$PREFIX.ext4"
-	fi
-
 	# clean up
 	lb chroot_devpts remove "$@"
 	lb chroot_sysfs remove "$@"

live-build/auto/config

@@ -642,16 +642,6 @@ case $ARCH in
 				add_package live ac100-tarball-installer
 				BINARY_REMOVE_LINUX=false
 				;;
-			nexus7)
-				COMPONENTS='main restricted universe multiverse'
-				add_package install zram-config abootimg 
-				add_package install nvidia-tegra3 ubuntu-defaults-nexus7
-				add_package live ac100-tarball-installer
-				BINARY_REMOVE_LINUX=false
-				mkdir -p config/preseed
-				echo "linux-firmware-nexus7 shared/nexus7_notice_accepted boolean true" >config/preseed/linux-firmware-nexus7.preseed.chroot
-				echo "d-i passwd/auto-login boolean true" >config/preseed/autologin.preseed.chroot
-				;;
 			raspi2)
 				COMPONENTS='main restricted universe multiverse'
 				add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools