diff --git a/debian/changelog b/debian/changelog index e6a21db9..2f9da9b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +livecd-rootfs (2.781) kinetic; urgency=medium + + * Drop override of components for raspi images. The reference to + multiverse is historic, all firmware is now in restricted where it + should be; and raspi images should not categorically include universe, + they should follow the per-flavor rules. + * Drop use of deprecated apt-key. + * Drop edubuntu and kubuntu-active, both obsolete in *all* supported + releases. + * Fix passing of components to germinate commandline (how did this ever + work?) + + -- Steve Langasek Wed, 21 Sep 2022 16:47:49 -0700 + +livecd-rootfs (2.780) kinetic; urgency=medium + + * live-build/auto/config: set COMPONENTS for all flavors *before* we + invoke germinate. Fixes a regression introduced in commit 07873ec. + In the process, stop declarations of COMPONENTS that shadow the default + in germinate (main restricted). + + -- Steve Langasek Wed, 21 Sep 2022 12:56:26 -0700 + livecd-rootfs (2.779) kinetic; urgency=medium * ubuntu-cpc/hooks.d/base/disk-image-uefi.binary: Bump UEFI disk image diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 3a65b99c..ea2f86f1 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -13,10 +13,7 @@ fi # Listed subprojects can be combined with other projects as well, # but this list gives reasonable coverage. ALL_TRIPLETS=" - edubuntu:: - edubuntu-dvd:: kubuntu:: - kubuntu-active:: kubuntu-dvd:: kubuntu-plasma5:: lubuntu:: diff --git a/live-build/auto/build b/live-build/auto/build index 9a1fd8ff..9c1f0fc9 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -432,7 +432,7 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release mv config/gnupg/Release.asc \ chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release.gpg - apt-key --keyring chroot/etc/apt/trusted.gpg add config/gnupg/pubring.gpg + cp config/gnupg/pubring.gpg chroot/etc/apt/trusted.gpg.d/livecd-rootfs.gpg find chroot/var/lib/preinstalled-pool/ -name Packages | xargs rm Chroot chroot "apt-get update" diff --git a/live-build/auto/config b/live-build/auto/config index 3a59cd89..b895a4df 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -620,9 +620,6 @@ fi mkdir -p config/germinate-output case $PROJECT in - kubuntu-active*) - SEED=kubuntu-active.$SUITE - ;; kubuntu*) SEED=kubuntu.$SUITE ;; @@ -652,11 +649,32 @@ case $PROJECT in ;; esac +case $PROJECT in + ubuntu-server) + COMPONENTS='main' + ;; + kubuntu|kubuntu-dvd|kubuntu-plasma5|ubuntu-gnome|ubuntu-budgie|ubuntukylin) + COMPONENTS='main restricted universe' + ;; + xubuntu|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) + COMPONENTS='main restricted universe multiverse' + ;; +esac + +case $SUBPROJECT in + buildd) + COMPONENTS='main restricted universe multiverse' + ;; +esac + if ! [ -e config/germinate-output/structure ]; then echo "Running germinate..." + if [ -n "$COMPONENTS" ]; then + GERMINATE_ARG="-c $(echo $COMPONENTS | sed -e's/ \+/,/g')" + fi (cd config/germinate-output && germinate --no-rdepends --no-installer \ -S $SEEDMIRROR -m $MIRROR -d $SUITE -s $SEED \ - ${COMPONENTS:+-c "$COMPONENTS"} -a $ARCH) + $GERMINATE_ARG -a $ARCH) fi case $PROJECT in @@ -717,7 +735,6 @@ case $PROJECT in ;; intel-iot) KERNEL_FLAVOURS='image-intel' - COMPONENTS='main restricted' OPTS="${OPTS:+$OPTS }--initramfs=none" OPTS="${OPTS:+$OPTS }--system=normal" OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs" @@ -736,7 +753,6 @@ case $PROJECT in KERNEL_FLAVOURS='generic-hwe-22.04' if [ "$SUBARCH" = "intel-iot" ]; then KERNEL_FLAVOURS='image-intel' - COMPONENTS='main restricted' fi ;; esac @@ -746,14 +762,6 @@ case $PROJECT in add_task install minimal standard add_task install kubuntu-desktop LIVE_TASK='kubuntu-live' - COMPONENTS='main restricted universe' - add_chroot_hook remove-gnome-icon-cache - ;; - - kubuntu-active) - add_task install minimal standard kubuntu-active - LIVE_TASK='kubuntu-active-live' - COMPONENTS='main restricted universe' add_chroot_hook remove-gnome-icon-cache ;; @@ -765,21 +773,13 @@ case $PROJECT in # get away with this as long as kubuntu-desktop and # kubuntu-plasma5-desktop don't grow too far apart. LIVE_TASK='kubuntu-live' - COMPONENTS='main restricted universe' add_chroot_hook remove-gnome-icon-cache ;; - edubuntu|edubuntu-dvd) - add_task install minimal standard ubuntu-desktop edubuntu-desktop-gnome - LIVE_TASK='edubuntu-live' - COMPONENTS='main restricted universe' - ;; - xubuntu) add_task install minimal standard xubuntu-desktop add_package install xterm LIVE_TASK='xubuntu-live' - COMPONENTS='main restricted universe multiverse' case $ARCH in amd64) KERNEL_FLAVOURS=generic ;; esac @@ -793,13 +793,11 @@ case $PROJECT in mythbuntu) add_task install minimal standard mythbuntu-desktop LIVE_TASK='mythbuntu-live' - COMPONENTS='main restricted universe multiverse' ;; lubuntu) add_task install minimal standard lubuntu-desktop LIVE_TASK='lubuntu-live' - COMPONENTS='main restricted universe multiverse' case $ARCH in amd64) KERNEL_FLAVOURS=generic ;; esac @@ -808,19 +806,16 @@ case $PROJECT in ubuntu-gnome) add_task install minimal standard ubuntu-gnome-desktop LIVE_TASK='ubuntu-gnome-live' - COMPONENTS='main restricted universe' ;; ubuntu-budgie) add_task install minimal standard ubuntu-budgie-desktop LIVE_TASK='ubuntu-budgie-live' - COMPONENTS='main restricted universe' ;; ubuntu-mate) add_task install minimal standard ubuntu-mate-core ubuntu-mate-desktop LIVE_TASK='ubuntu-mate-live' - COMPONENTS='main restricted universe multiverse' ;; ubuntu-unity) @@ -833,12 +828,10 @@ case $PROJECT in add_package live a11y-profile-manager add_package live gparted cifs-utils add_package live memtest86+ - COMPONENTS='main restricted universe multiverse' ;; ubuntustudio-dvd) add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-graphics ubuntustudio-video ubuntustudio-photography - COMPONENTS='main restricted universe multiverse' case $ARCH in amd64) KERNEL_FLAVOURS=lowlatency ;; esac @@ -848,7 +841,6 @@ case $PROJECT in add_task install minimal standard ubuntukylin-desktop add_package install ubuntukylin-default-settings LIVE_TASK='ubuntukylin-live' - COMPONENTS='main restricted universe' ;; ubuntu-server) @@ -913,7 +905,6 @@ case $PROJECT in exit 1 ;; esac - COMPONENTS='main' PREINSTALL_POOL_SEEDS='server-ship' ;; @@ -969,7 +960,6 @@ case $PROJECT in KERNEL_FLAVOURS=generic elif [ "${SUBARCH:-}" = "intel-iot" ]; then KERNEL_FLAVOURS=image-intel - COMPONENTS='main restricted' OPTS="${OPTS:+$OPTS }--initramfs=none" fi ;; @@ -1004,7 +994,6 @@ esac case $SUBPROJECT in buildd) OPTS="${OPTS:+$OPTS }--archive-areas main" - COMPONENTS='main restricted universe multiverse' OPTS="${OPTS:+$OPTS }--apt-recommends false" OPTS="${OPTS:+$OPTS }--apt-secure false" OPTS="${OPTS:+$OPTS }--parent-mirror-binary ${MIRROR}" @@ -1109,7 +1098,6 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in # Common configuration for all Raspberry Pi image variants (server, # desktop etc.) KERNEL_FLAVOURS="$SUBARCH" - COMPONENTS='main restricted universe multiverse' # Most Pi-specific package installation is handled via the seeds in the # per-project/subproject cases above add_package install linux-firmware-raspi2 pi-bluetooth u-boot-rpi u-boot-tools @@ -1145,7 +1133,6 @@ case $PROJECT in KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}" case $SUBARCH in intel-iot) - COMPONENTS='main restricted' KERNEL_FLAVOURS='image-intel' ;; esac