Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-08-14 18:24:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 23.10.51 from mantic-release pocket.

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2023-10-03 03:54:06 +00:00
parent 903582a239
commit f394ee08a7
4 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
livecd-rootfs (23.10.51) mantic; urgency=medium
[ Dimitri John Ledkov ]
* Add support to live-build/lb_chroot_layered to allow adding the kernel to
the currently required layer location, which fixes arm64+x13s and also
allows for removing live-build/ubuntu/hooks/020-ubuntu-live.binary.
-- Dan Bungert <daniel.bungert@canonical.com> Mon, 02 Oct 2023 14:55:29 -0600
livecd-rootfs (23.10.50) mantic; urgency=medium livecd-rootfs (23.10.50) mantic; urgency=medium
* live-build/ubuntu/hooks: ensure kernel artifacts named with subarch * live-build/ubuntu/hooks: ensure kernel artifacts named with subarch

2
live-build/auto/config
View File

@ -1223,7 +1223,7 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in
esac esac
case $PROJECT:${SUBPROJECT:-} in 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" OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
KERNEL_FLAVOURS=none KERNEL_FLAVOURS=none
BINARY_REMOVE_LINUX=false BINARY_REMOVE_LINUX=false

9
live-build/lb_chroot_layered
View File

@ -167,7 +167,6 @@ create_chroot_pass () {
fi fi
# Customizing chroot # Customizing chroot
lb chroot_linux-image ${*}
lb chroot_preseed ${*} lb chroot_preseed ${*}
lb chroot_early_hooks ${*} lb chroot_early_hooks ${*}
@ -205,7 +204,15 @@ create_chroot_pass () {
# Add live packages to live layers # Add live packages to live layers
for livepass in $LIVE_PASSES; do for livepass in $LIVE_PASSES; do
[ "$livepass" != "$pass" ] && continue [ "$livepass" != "$pass" ] && continue
lb chroot_linux-image ${*}
lb chroot_live-packages ${*} lb chroot_live-packages ${*}
if [ "$LB_LINUX_PACKAGES" = "linux" ]; then
for flavour in $LB_LINUX_FLAVOURS; do
mkdir -p chroot/etc/subiquity
echo "linux-$flavour" > chroot/etc/subiquity/kernel-meta-package
break
done
fi
break break
done done

28
live-build/ubuntu/hooks/020-ubuntu-live.binary
View File

@ -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