Merge lp:~rbalint/livecd-rootfs/fix-minimized-ppc64el-image-build into lp:livecd-rootfs

[Balint Reczey]

[lp:~rbalint/livecd-rootfs/fix-minimized-ppc64el-image-build]

1558. By Steve Langasek on 2017-10-10

releasing package livecd-rootfs version 2.472

[lp:~rbalint/livecd-rootfs/fix-minimized-ppc64el-image-build]

1559. By Balint Reczey on 2017-10-10

Clean up dangling /boot/initrd.img symlink when needed

1560. By Balint Reczey on 2017-10-10

Revert ignoring failure of minimized autopkgtest on ppc64el

1561. By Balint Reczey on 2017-10-10

Use kvm kernel only on amd64

1562. By Balint Reczey on 2017-10-10

Skip installing server task when building minimial images

1563. By Balint Reczey on 2017-10-10

Update changelog

=== modified file 'debian/changelog'
--- debian/changelog	2017-10-10 22:41:05 +0000
+++ debian/changelog	2017-10-10 23:59:30 +0000
@@ -1,3 +1,12 @@
+livecd-rootfs (2.473) UNRELEASED; urgency=medium
+
+  * Clean up dangling /boot/initrd.img symlink when needed
+  * Revert ignoring failure of minimized autopkgtest on ppc64el
+  * Use kvm kernel only on amd64
+  * Skip installing server task when building minimial images
+
+ -- Balint Reczey <[e-mail]>  Wed, 11 Oct 2017 01:58:39 +0200
+
 livecd-rootfs (2.472) artful; urgency=medium
 
   [ Michael Hudson-Doyle ]
 
=== modified file 'debian/tests/minimized'
--- debian/tests/minimized	2017-10-01 20:39:14 +0000
+++ debian/tests/minimized	2017-10-10 23:59:30 +0000
@@ -1,11 +1,3 @@
 #!/bin/sh
 
-ARCH=$(dpkg --print-architecture)
-
-failure_code=1
-if [ "$ARCH" = ppc64el ]; then
-	# not a regression; don't block while debugging
-	failure_code=0
-fi
-
-env SELECTED_TRIPLETS=ubuntu-cpc:minimized:ubuntu-cpc debian/tests/default-bootstraps || exit $failure_code
+env SELECTED_TRIPLETS=ubuntu-cpc:minimized:ubuntu-cpc debian/tests/default-bootstraps
 
=== modified file 'live-build/auto/config'
--- live-build/auto/config	2017-10-04 17:13:13 +0000
+++ live-build/auto/config	2017-10-10 23:59:30 +0000
@@ -540,7 +540,7 @@
 			# linux-kvm is available since you control the
 			# archive and can provide this metapackage as
 			# necessary.
-			if [ -z "$EXTRA_PPAS" ] && [ "$SUITE" != xenial ]; then
+			if [ "$ARCH" != "amd64" ] || ([ -z "$EXTRA_PPAS" ] && [ "$SUITE" != xenial ]); then
 				KERNEL_FLAVOURS=virtual
 			else
 				KERNEL_FLAVOURS=kvm
@@ -549,6 +549,11 @@
 			add_task install minimal standard cloud-image
 			add_package install ubuntu-minimal
 			KERNEL_FLAVOURS=virtual
+		        case $ARCH in
+				armhf|arm64|ppc64el|powerpc)
+					add_task install server
+					;;
+			esac
 		fi
 
 		BINARY_REMOVE_LINUX=false
@@ -557,17 +562,9 @@
 			armhf)
 				KERNEL_FLAVOURS=generic-lpae
 				add_package install flash-kernel
-				add_task install server
 				;;
 			arm64)
 				add_package install flash-kernel
-				add_task install server
-				;;
-			ppc64el)
-				add_task install server
-				;;
-			powerpc)
-				add_task install server
 				;;
 		esac
 		OPTS="${OPTS:+$OPTS }--system=normal"
 
=== modified file 'live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot'
--- live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot	2017-09-29 19:20:14 +0000
+++ live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot	2017-10-10 23:59:30 +0000
@@ -130,6 +130,11 @@
    } > "${rootd}/etc/overlayroot.local.conf"
 fi
 
+# previous steps may have left a dangling symlink here with
+# SUBPROJECT=minimized and that breaks lb_chroot_hacks step
+if [ -L "${rootd}/boot/initrd.img" ] && [ ! -e "${rootd}/boot/initrd.img" ]; then
+	rm "${rootd}/boot/initrd.img"
+fi
 
 #### END COMMON ARCH FUNCTIONS