From 8a9ba050c350d4be6eb47b28bbdbd39c5b062637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Fri, 18 Aug 2023 12:16:28 +0200 Subject: [PATCH 1/2] Make canary images default for Ubuntu. --- live-build/auto/config | 32 ++----------------- .../base/disk-image-uefi-non-cloud.binary | 4 +-- ...b.binary => 020-ubuntu-enhanced-sb.binary} | 12 +++---- ...ary-live.binary => 020-ubuntu-live.binary} | 12 +++---- ...oot_early => 020-ubuntu-live.chroot_early} | 6 +--- .../hooks/040-hyperv-desktop-images.binary | 2 +- 6 files changed, 15 insertions(+), 53 deletions(-) rename live-build/ubuntu/hooks/{020-canary-enhanced-sb.binary => 020-ubuntu-enhanced-sb.binary} (95%) rename live-build/ubuntu/hooks/{020-canary-live.binary => 020-ubuntu-live.binary} (95%) rename live-build/ubuntu/hooks/{020-canary-live.chroot_early => 020-ubuntu-live.chroot_early} (73%) diff --git a/live-build/auto/config b/live-build/auto/config index a2b16429..b21643ed 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -721,7 +721,7 @@ case $PROJECT in ;; esac ;; - canary) + *) PASSES_TO_LAYERS="true" # the standard layer, contains all base common packages for later layers (we're splitting out the snaps) add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages @@ -772,32 +772,6 @@ case $PROJECT in /usr/share/livecd-rootfs/checkout-translations-branch \ https://git.launchpad.net/subiquity po config/catalog-translations ;; - *) - touch config/universe-enabled - PASSES_TO_LAYERS="true" - KERNEL_FLAVOURS='generic-hwe-22.04' - add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages - add_task standard.live ubuntu-live - add_package standard cloud-init - remove_package standard.live ubiquity-frontend-gtk - add_snap standard.live ubuntu-desktop-installer/classic - - seeded_langs="$(get_seeded_languages desktop)" - echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages - derive_language_layers standard desktop desktop-default-languages "$seeded_langs" - cat <<-EOF > config/standard.catalog-in.yaml - name: "Ubuntu Desktop" - description: >- - Ubuntu Desktop. - id: ubuntu-desktop - type: fsimage-layered - variant: desktop - locale_support: langpack - default: yes - EOF - /usr/share/livecd-rootfs/checkout-translations-branch \ - https://git.launchpad.net/subiquity po config/catalog-translations - ;; esac ;; @@ -1298,7 +1272,7 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in esac case $PROJECT:${SUBPROJECT:-} in - ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*|ubuntu:canary) + ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*|ubuntu:) OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" KERNEL_FLAVOURS=none BINARY_REMOVE_LINUX=false @@ -1552,7 +1526,7 @@ EOF ;; ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \ - ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:canary|ubuntu-oem:*) + ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:|ubuntu-oem:*) # Ensure that most things e.g. includes.chroot are copied as is for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do case $entry in diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary index 781419cf..2235f65f 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary @@ -10,8 +10,8 @@ case $ARCH in esac case ${PROJECT:-}:${SUBPROJECT:-} in - *:canary) - echo "We don't create EFI images for canary." + ubuntu:) + echo "We don't create EFI images for Ubuntu Desktop." exit 0 ;; ubuntu) diff --git a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary similarity index 95% rename from live-build/ubuntu/hooks/020-canary-enhanced-sb.binary rename to live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary index 10afd496..23035fbe 100644 --- a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary +++ b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary @@ -10,14 +10,10 @@ case ${PASS:-} in ;; esac -case ${SUBPROJECT:-} in - canary) - ;; - *) - echo "We don't run canary hooks for this project." - exit 0 - ;; -esac +if [ -n "${SUBPROJECT:-}" ]; then + echo "We don't run Ubuntu Desktop hooks for this project." + exit 0 +fi . config/binary diff --git a/live-build/ubuntu/hooks/020-canary-live.binary b/live-build/ubuntu/hooks/020-ubuntu-live.binary similarity index 95% rename from live-build/ubuntu/hooks/020-canary-live.binary rename to live-build/ubuntu/hooks/020-ubuntu-live.binary index 2c661787..7e234c10 100755 --- a/live-build/ubuntu/hooks/020-canary-live.binary +++ b/live-build/ubuntu/hooks/020-ubuntu-live.binary @@ -10,14 +10,10 @@ case ${PASS:-} in ;; esac -case ${SUBPROJECT:-} in - canary) - ;; - *) - echo "We don't run canary hooks for this project." - exit 0 - ;; -esac +if [ -n "${SUBPROJECT:-}" ]; then + echo "We don't run Ubuntu Desktop hooks for this project." + exit 0 +fi . config/binary diff --git a/live-build/ubuntu/hooks/020-canary-live.chroot_early b/live-build/ubuntu/hooks/020-ubuntu-live.chroot_early similarity index 73% rename from live-build/ubuntu/hooks/020-canary-live.chroot_early rename to live-build/ubuntu/hooks/020-ubuntu-live.chroot_early index 76846f3b..d8d60cb6 100755 --- a/live-build/ubuntu/hooks/020-canary-live.chroot_early +++ b/live-build/ubuntu/hooks/020-ubuntu-live.chroot_early @@ -10,12 +10,8 @@ case ${PASS:-} in ;; esac -# TODO: Make sure this is only executed for canary builds (in a way -# other then relying on the fact that these hooks are only copied for -# an ubuntu:canary build) - # As described in LP: #2025339, an initrd built from a jammy userspace -# (which is what we use for canary builds currently) cannot fsck a +# (which is what we use for Ubuntu Desktop builds currently) cannot fsck a # mantic root filesystem created with the default options. sed -i -e 's/,orphan_file//' /etc/mke2fs.conf diff --git a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary index b27114ab..1e7bc461 100644 --- a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary +++ b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary @@ -3,7 +3,7 @@ echo "Creating Hyper-V image with Desktop..." case ${SUBPROJECT:-} in - minimized|canary) + minimized|"") echo "We don't create minimized images for $0." exit 0 ;; From 76141ad5f33bd54fb36665ad7e9d56c54c38c471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Tue, 5 Sep 2023 19:23:32 +0200 Subject: [PATCH 2/2] Add changelog. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index af16d5bf..6b38f330 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (23.10.31) UNRELEASED; urgency=medium + + * Make the hybrid canary images the default for Ubuntu. + + -- Łukasz 'sil2100' Zemczak Tue, 05 Sep 2023 19:21:34 +0200 + livecd-rootfs (23.10.30) mantic; urgency=medium * Fix unminimize to correctly list packages. (LP: #1996489)