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.29 from mantic-release pocket.

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2023-09-01 00:51:09 +00:00
parent 623d07832b
commit d7433f8c37
3 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (23.10.29) mantic; urgency=medium
* canary: switch to use the live task, try to use KERNEL_FLAVOURS instead
of a manual kernel add_package.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Wed, 31 Aug 2023 11:57:11 +0200
livecd-rootfs (23.10.28) mantic; urgency=medium livecd-rootfs (23.10.28) mantic; urgency=medium
* Allow stderr in the autopkgtest. * Allow stderr in the autopkgtest.

6
live-build/auto/config
View File

@ -724,12 +724,12 @@ case $PROJECT in
canary) canary)
touch config/universe-enabled touch config/universe-enabled
PASSES_TO_LAYERS="true" PASSES_TO_LAYERS="true"
KERNEL_FLAVOURS='generic-hwe-22.04'
# the standard layer, contains all base common packages for later layers # the standard layer, contains all base common packages for later layers
add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages
add_package standard cloud-init add_package standard cloud-init
# the live layer, contains all packages for the live session installer # the live layer, contains all packages for the live session installer
# TODO: we should probably add the kernel per KERNEL_FLAVOURS add_task standard.live ubuntu-live
add_package standard.live linux-generic casper lvm2 mdadm cryptsetup dctrl-tools
remove_package standard.live ubiquity-frontend-gtk remove_package standard.live ubiquity-frontend-gtk
add_snap standard.live ubuntu-desktop-installer/classic add_snap standard.live ubuntu-desktop-installer/classic
# the enhanced-secureboot layer, contains all packages for the enhanced secureboot install # the enhanced-secureboot layer, contains all packages for the enhanced secureboot install
@ -1298,7 +1298,7 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in
esac esac
case $PROJECT:${SUBPROJECT:-} in case $PROJECT:${SUBPROJECT:-} in
ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*|ubuntu:canary) 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

27
live-build/ubuntu/hooks/020-canary-live.binary
View File

@ -1,27 +0,0 @@
#! /bin/sh
set -eux
case ${PASS:-} in
standard.live)
;;
*)
exit 0
;;
esac
case ${SUBPROJECT:-} in
canary)
;;
*)
echo "We don't run canary hooks for this project."
exit 0
;;
esac
. config/binary
. config/functions
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