Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2026-01-03 01:13:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 2.825

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2023-04-13 12:48:10 +00:00
parent 0159a8c967
commit dfb2723071
5 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debian/changelog vendored
View File

@ -1,3 +1,17 @@
livecd-rootfs (2.825) lunar; urgency=medium
* For canary images, actually consider moving the seed listed snaps from
both minimal and standard layers to the classic layer.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 13 Apr 2023 11:46:37 +0200
livecd-rootfs (2.824) lunar; urgency=medium
* Fix build failures of desktop raspi images due to canary hooks
interfering.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 13 Apr 2023 09:43:58 +0200
livecd-rootfs (2.823) lunar; urgency=medium livecd-rootfs (2.823) lunar; urgency=medium
* Update infinite_scream URL to mastodon * Update infinite_scream URL to mastodon

12
live-build/auto/config
View File

@ -745,10 +745,16 @@ case $PROJECT in
add_package minimal cloud-init add_package minimal cloud-init
# the standard layer, contains all base common packages for later layers (we're splitting out the snaps) # the standard layer, contains all base common packages for later layers (we're splitting out the snaps)
add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages
# the classic layer, basically only contains snaps from the standard tasks # the classic layer, basically only contains snaps from the standard and minimal tasks
add_pass minimal.standard.classic add_pass minimal.standard.classic
mv config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.full \ if [ -e "config/package-lists/livecd-rootfs.snaplist.chroot_minimal.full" ]; then
config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.classic.full cat config/package-lists/livecd-rootfs.snaplist.chroot_minimal.full >>config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.classic.full
rm config/package-lists/livecd-rootfs.snaplist.chroot_minimal.full
fi
if [ -e "config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.full" ]; then
cat config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.full >>config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.classic.full
rm config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.full
fi
# 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 # TODO: we should probably add the kernel per KERNEL_FLAVOURS
add_package minimal.standard.live linux-generic casper lvm2 mdadm add_package minimal.standard.live linux-generic casper lvm2 mdadm

2
live-build/ubuntu/hooks/020-canary-enhanced-sb.binary
View File

@ -2,7 +2,7 @@
set -eux set -eux
case $PASS in case ${PASS:-} in
minimal.standard.enhanced-secureboot) minimal.standard.enhanced-secureboot)
;; ;;
*) *)

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

@ -2,7 +2,7 @@
set -eux set -eux
case $PASS in case ${PASS:-} in
minimal.standard.live) minimal.standard.live)
;; ;;
*) *)

2
live-build/ubuntu/hooks/020-canary-live.chroot_early
View File

@ -2,7 +2,7 @@
set -eu set -eu
case $PASS in case ${PASS:-} in
minimal.standard.live) minimal.standard.live)
;; ;;
*) *)