From e37f175d5be4a8a92c2fb5d714414b7baab20504 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Fri, 11 Jun 2021 16:31:07 +0000 Subject: [PATCH] Imported 2.724 No reason for CPC update specified. --- debian/changelog | 9 +++++++++ live-build/auto/config | 21 ++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 26fae065..3113272e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.724) impish; urgency=medium + + * Use the server-raspi task name instead of ubuntu-server-raspi. It's still + a mystery to me why ubuntu-desktop-raspi works as expected but the server + variant needs to use 'server-raspi', even though both tasks seem + implemented in the same way. + + -- Ɓukasz 'sil2100' Zemczak Wed, 09 Jun 2021 11:14:13 +0200 + livecd-rootfs (2.723) impish; urgency=medium [ Steve Langasek ] diff --git a/live-build/auto/config b/live-build/auto/config index fb2afc05..ab550907 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -186,6 +186,24 @@ remove_package () done } +add_snap () +{ + # Adds a pass named pass_name composed of snaps to install + # $1 pass + # $@ list of snaps + + local pass="$1" + shift + local pkg + + _check_immutable_passes_to_layers + _register_pass "$pass" + + for pkg; do + echo "$pkg" >> "config/package-lists/livecd-rootfs.snaplist.chroot_$pass.full" + done +} + add_packages_from_seed_regexp () { # Creates one or more passes, depending on base_pass_name, from any seeds matching seed_regexp. # $1 base pass @@ -603,6 +621,7 @@ case $PROJECT in add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages add_task minimal.standard.live ubuntu-live add_package minimal.standard.live lupin-casper + add_snap minimal.standard.live ubuntu-desktop-installer/classic # LANG PASS for minimal and standard remove_packages_from_seed_regexp minimal desktop-minimal-default-languages '^desktop-minimal-(?!default-languages)[^.]+$' @@ -773,7 +792,7 @@ case $PROJECT in OPTS="${OPTS:+$OPTS }--initramfs=none" case "$ARCH+${SUBARCH:-}" in *+raspi) - add_task install ubuntu-server-raspi + add_task install server-raspi ;; armhf*) KERNEL_FLAVOURS=generic-lpae