From 549232f607d743ba069c435fa56cae36ede0c10b Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Wed, 11 Oct 2017 01:57:03 +0200 Subject: [PATCH 1/5] Clean up dangling /boot/initrd.img symlink when needed --- live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot index e59e38c8..8b22fc8e 100755 --- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot @@ -130,6 +130,11 @@ if [ -f "${rootd}/etc/overlayroot.conf" ] && } > "${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 From d3ef9c62316c95989aa17d0c0d702b8b849e464f Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Wed, 11 Oct 2017 01:57:03 +0200 Subject: [PATCH 2/5] Revert ignoring failure of minimized autopkgtest on ppc64el --- debian/tests/minimized | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/debian/tests/minimized b/debian/tests/minimized index 0807a764..c5da93ee 100644 --- a/debian/tests/minimized +++ b/debian/tests/minimized @@ -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 From d6bb42bc63a77971184cff91531dc9c0a7de7701 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Wed, 11 Oct 2017 01:57:03 +0200 Subject: [PATCH 3/5] Use kvm kernel only on amd64 --- live-build/auto/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/auto/config b/live-build/auto/config index 23880265..d78f6a54 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -540,7 +540,7 @@ case $PROJECT in # 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 From 314655a2ae4763aa96d54782a4e7e78155422f54 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Wed, 11 Oct 2017 01:57:03 +0200 Subject: [PATCH 4/5] Skip installing server task when building minimial images --- live-build/auto/config | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index d78f6a54..bf7435d7 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -549,6 +549,11 @@ case $PROJECT in 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 @@ case $PROJECT in 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" From 2e518950c7fc2ca8516f496c2110a0b060ad1371 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Wed, 11 Oct 2017 01:59:06 +0200 Subject: [PATCH 5/5] Update changelog --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4c37756c..fcdaf282 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Wed, 11 Oct 2017 01:58:39 +0200 + livecd-rootfs (2.472) artful; urgency=medium [ Michael Hudson-Doyle ]