From 11b039f3a9fdfd85910165ef4fc8ded389cd4307 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Sat, 14 Mar 2020 02:18:48 +0000 Subject: [PATCH] Imported 2.654 No reason for CPC update specified. --- debian/changelog | 7 +++++++ live-build/auto/config | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 98a36549..7f7ea25f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.654) focal; urgency=medium + + * Only install oem-20.04 kernel flavour on amd64, as it doesn't exist on + other arches. + + -- Dimitri John Ledkov Fri, 13 Mar 2020 20:20:13 +0000 + livecd-rootfs (2.653) focal; urgency=medium * Stop trying to extract autoinstall config during boot, subiquity will do diff --git a/live-build/auto/config b/live-build/auto/config index 5ad70e12..6302715a 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -581,7 +581,12 @@ case $PROJECT in LIVE_TASK='ubuntu-live' add_task install minimal standard ubuntu-desktop add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages - KERNEL_FLAVOURS='generic oem-20.04' + KERNEL_FLAVOURS='generic' + case $ARCH in + amd64) + KERNEL_FLAVOURS='generic oem-20.04' + ;; + esac ;; esac ;;