[Merge] ~xnox/livecd-rootfs:fix-desktop-live-kernel-renames into livecd-rootfs:ubuntu/master

Dimitri John Ledkov mp+452363 at code.launchpad.net
Thu Sep 28 13:06:28 UTC 2023


Dimitri John Ledkov has proposed merging ~xnox/livecd-rootfs:fix-desktop-live-kernel-renames into livecd-rootfs:ubuntu/master.

Commit message:
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 years 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")

Test builds with finally coorrect livecd.ubuntu.kernel-generic & livecd.ubuntu-x13s.kernel-laptop are presented at:
https://launchpad.net/~ubuntu-concept/+livefs/ubuntu/mantic/ubuntu/+build/504032 amd64 generic
https://launchpad.net/~ubuntu-concept/+livefs/ubuntu/mantic/ubuntu/+build/504033 arm64+x13s laptop

Requested reviews:
  Canonical Foundations Team (canonical-foundations)

For more details, see:
https://code.launchpad.net/~xnox/livecd-rootfs/+git/livecd-rootfs/+merge/452363
-- 
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1432 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20230928/11d2e239/attachment.diff>


More information about the Ubuntu-reviews mailing list