From d5e9651fe092060942e68b832e31671078986430 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Thu, 28 Sep 2023 01:14:28 +0100 Subject: [PATCH] remove live-build/ubuntu/hooks/020-ubuntu-live.binary: handled elsewhere Now that kernel names use expected -generic flavour, and kernels are installed in the live layer, we can go back to stock behaviour of auto/build noticing that binary hooks are called on a live layer and executing the extraction & rename of the kernel flavours. BTW we can even later expand that to support 2 generic abis, and calling the bigger one the hwe generic such that can also remove ./live-build/ubuntu-server/hooks/04-kernel-bits.binary. This fixes ubuntu arm64+x13s that is unable to find ubuntu-x13s.kernel-laptop as due to this hook, which currently produces ubuntu.kernel-generic in error which is not at all expected by ubuntu-cdimage. Also this unbreaks producing oem & intel-iot images, although we will build these in 24.04 only next. This reverts ubuntu daily-live to use `--linux-flavours laptop-generic-hwe-22.04` instead of `--linux-flavours none --linux-packages=none --initramfs=none`, like it did in lunar and pre-canary-image or images that install kernel in live layer. Fixes: c00bbf3fb3 ("desktop: place kernel in the live layer") Signed-off-by: Dimitri John Ledkov --- live-build/auto/config | 2 +- .../ubuntu/hooks/020-ubuntu-live.binary | 28 ------------------- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100755 live-build/ubuntu/hooks/020-ubuntu-live.binary diff --git a/live-build/auto/config b/live-build/auto/config index f90611d7..c528e36d 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1223,7 +1223,7 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in esac case $PROJECT:${SUBPROJECT:-} in - ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*|ubuntu:) + ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*) OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" KERNEL_FLAVOURS=none BINARY_REMOVE_LINUX=false diff --git a/live-build/ubuntu/hooks/020-ubuntu-live.binary b/live-build/ubuntu/hooks/020-ubuntu-live.binary deleted file mode 100755 index 7f44aad8..00000000 --- a/live-build/ubuntu/hooks/020-ubuntu-live.binary +++ /dev/null @@ -1,28 +0,0 @@ -#! /bin/sh - -# Kernels are deliberately installed into the live layer for Subiquity -# installers. This provides the ability to select a different kernel later, a -# key function for OEM support and a general capability for Subiquity. - -set -eux - -case ${PASS:-} in - minimal.standard.live) - ;; - *) - exit 0 - ;; -esac - -if [ -n "${SUBPROJECT:-}" ]; then - echo "We don't run Ubuntu Desktop hooks for this project." -fi - -. config/binary -. config/functions - -PROJECT=$PROJECT${SUBARCH:+-$SUBARCH} - -mv chroot/boot/initrd.img-* ${PWD}/livecd.${PROJECT}.initrd-generic -mv chroot/boot/vmlinu?-* ${PWD}/livecd.${PROJECT}.kernel-generic -chmod a+r ${PWD}/livecd.${PROJECT}.initrd-generic ${PWD}/livecd.${PROJECT}.kernel-generic