From eb0530b7a7bf39a235848d290dd6c231e642c731 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Tue, 26 Jul 2022 10:05:42 -0600 Subject: [PATCH 01/88] functions: inform cloud-init about network manager LP: #1982855 Co-authored-by: Chad Smith --- live-build/functions | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/live-build/functions b/live-build/functions index a6fa5bf2..1c978a4c 100644 --- a/live-build/functions +++ b/live-build/functions @@ -989,6 +989,16 @@ network: version: 2 renderer: NetworkManager EOF + + # inform cloud-init of the same (LP: #1982855) + mkdir -p chroot/etc/cloud/cloud.cfg.d + cat < chroot/etc/cloud/cloud.cfg.d/99-installer-use-networkmanager.cfg +# Let NetworkManager manage all devices on this system +system_info: + network: + renderers: ['network-manager'] + activators: ['network-manager'] +EOF else echo "==== NetworkManager not installed ====" fi From ef834c2e7db47b5e78af770052e785e6db1bfde3 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Mon, 1 Aug 2022 14:54:10 -0600 Subject: [PATCH 02/88] functions: let `cloud-init clean` inform about NM --- live-build/functions | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/live-build/functions b/live-build/functions index 1c978a4c..4b0fbc38 100644 --- a/live-build/functions +++ b/live-build/functions @@ -999,6 +999,17 @@ system_info: renderers: ['network-manager'] activators: ['network-manager'] EOF + + # Allow cloud-init clean to inform of strict network-manager config + mkdir -p chroot/etc/cloud/clean.d + cat < chroot/etc/cloud/clean.d/99-installer-use-networkmanager +# Inform clone image creators about strict network-manager cfg for cloud-init +if [ -f /etc/cloud/cloud.cfg.d/99-installer-use-networkmanager.cfg ]; then + echo "WARNING: cloud-init network config is limited to using network-manager." + echo "If this is undesirable: rm /etc/cloud/cloud.cfg.d/99-installer-use-networkmanager.cfg" +fi +EOF + chmod +x chroot/etc/cloud/clean.d/99-installer-use-networkmanager else echo "==== NetworkManager not installed ====" fi From e93a80bb6e6b3cfabed5ca2f0eadae21dc9f0b0f Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Mon, 1 Aug 2022 15:00:28 -0600 Subject: [PATCH 03/88] changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index b2ff3a43..befca4da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.774) UNRELEASED; urgency=medium + + * Inform cloud-init when network manager is in use. (LP: #1982855) + + -- Dan Bungert Mon, 01 Aug 2022 14:59:17 -0600 + livecd-rootfs (2.773) kinetic; urgency=medium * When adding the new RISC-V platforms, some of the generic non-SUBARCH code From c5323876355487ddd9bd6950dc4b76b511596290 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 5 Jan 2023 22:07:15 -0800 Subject: [PATCH 04/88] Don't depend on python3-launchpadlib on i386. This breaks ppa-enabled builds on i386, but avoids pulling in a large dependency tree that's not otherwise needed on i386. --- debian/changelog | 8 ++++++++ debian/control | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6517126e..54a44116 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.795) UNRELEASED; urgency=medium + + * Don't depend on python3-launchpadlib on i386. This breaks ppa-enabled + builds on i386, but avoids pulling in a large dependency tree that's + not otherwise needed on i386. + + -- Steve Langasek Thu, 05 Jan 2023 22:06:19 -0800 + livecd-rootfs (2.794) lunar; urgency=medium [ Sebastien Bacher ] diff --git a/debian/control b/debian/control index 4aa37bb9..560a77e5 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Depends: ${misc:Depends}, procps, python3, python3-apt, - python3-launchpadlib, + python3-launchpadlib [!i386], python3-yaml, qemu-utils [!i386], rsync, From a91b0cfda558a1b145189530a549cb3bfd3d1b5b Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 5 Jan 2023 22:07:21 -0800 Subject: [PATCH 05/88] releasing package livecd-rootfs version 2.795 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 54a44116..307d7efe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -livecd-rootfs (2.795) UNRELEASED; urgency=medium +livecd-rootfs (2.795) lunar; urgency=medium * Don't depend on python3-launchpadlib on i386. This breaks ppa-enabled builds on i386, but avoids pulling in a large dependency tree that's not otherwise needed on i386. - -- Steve Langasek Thu, 05 Jan 2023 22:06:19 -0800 + -- Steve Langasek Thu, 05 Jan 2023 22:07:17 -0800 livecd-rootfs (2.794) lunar; urgency=medium From fa81e76cbe05842382cd4fd8876d45c406ef169e Mon Sep 17 00:00:00 2001 From: Sean Davis Date: Sat, 7 Jan 2023 22:47:49 -0500 Subject: [PATCH 06/88] Enable xubuntu-core --- debian/tests/default-bootstraps | 3 ++- live-build/auto/config | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 9e1fc5f6..6e8cbb8f 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -38,7 +38,8 @@ ALL_TRIPLETS=" ubuntu-mate-live:: ubuntu-netbook:: ubuntu-server:live:ubuntu-server - xubuntu::" + xubuntu:: + xubuntu-core::" if [ -z "$SELECTED_TRIPLETS" ]; then SELECTED_TRIPLETS=" diff --git a/live-build/auto/config b/live-build/auto/config index 1722e98b..e8f45d1e 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -656,7 +656,7 @@ case $PROJECT in 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) + xubuntu|xubuntu-core|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) COMPONENTS='main restricted universe multiverse' ;; esac @@ -784,6 +784,15 @@ case $PROJECT in esac ;; + xubuntu-core) + add_task install minimal standard xubuntu-core + add_package install xterm + LIVE_TASK='xubuntu-live' + case $ARCH in + amd64) KERNEL_FLAVOURS=generic ;; + esac + ;; + ubuntu-netbook) add_task install minimal standard ubuntu-netbook LIVE_TASK='netbook-live' From c72e5c8d03080e70805cc0672901d9f126a97e6e Mon Sep 17 00:00:00 2001 From: Sean Davis Date: Sun, 8 Jan 2023 00:19:56 -0500 Subject: [PATCH 07/88] Rename Xubuntu Core > Xubuntu Minimal --- debian/tests/default-bootstraps | 2 +- live-build/auto/config | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 6e8cbb8f..76869366 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -39,7 +39,7 @@ ALL_TRIPLETS=" ubuntu-netbook:: ubuntu-server:live:ubuntu-server xubuntu:: - xubuntu-core::" + xubuntu-minimal::" if [ -z "$SELECTED_TRIPLETS" ]; then SELECTED_TRIPLETS=" diff --git a/live-build/auto/config b/live-build/auto/config index e8f45d1e..3b12488b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -656,7 +656,7 @@ case $PROJECT in kubuntu|kubuntu-dvd|kubuntu-plasma5|ubuntu-gnome|ubuntu-budgie|ubuntukylin) COMPONENTS='main restricted universe' ;; - xubuntu|xubuntu-core|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) + xubuntu|xubuntu-minimal|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) COMPONENTS='main restricted universe multiverse' ;; esac @@ -784,7 +784,7 @@ case $PROJECT in esac ;; - xubuntu-core) + xubuntu-minimal) add_task install minimal standard xubuntu-core add_package install xterm LIVE_TASK='xubuntu-live' From 71308d500bd3e7a78e7b605dd7634cfae48f6293 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Mon, 9 Jan 2023 11:37:16 +0100 Subject: [PATCH 08/88] riscv64: adjust U-Boot installation for Nezha D1 and LicheeRV Since version 2022.10 U-Boot SPL and U-Boot are installed onto the same partition. Package nezha-boot0 is not needed anymore. Signed-off-by: Heinrich Schuchardt --- .../ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 3c6bd3dd..8ef4fca6 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -298,16 +298,12 @@ install_grub() { chroot mountpoint bash -c 'FK_FORCE=yes apt-get install -qqy grub-efi-riscv64 flash-kernel' efi_target=riscv64-efi - # nezha-boot0 is actually compatible with the LicheeRV boards (and probably other D1-based boards) - chroot mountpoint apt-get install -qqy nezha-boot0 - # FSBL, which gets U-Boot SPL - loader1="/dev/mapper${loop_device///dev/}p13" - dd if=mountpoint/usr/lib/u-boot/nezha/boot0_sdcard_sun20iw1p1.bin of=$loader1 - # The real U-Boot - # u-boot-nezha actually contains both the LicheeRV and the Nezha boards support + # u-boot-nezha supports both the LicheeRV and the Nezha D1. chroot mountpoint apt-get install -qqy u-boot-nezha - loader2="/dev/mapper${loop_device///dev/}p14" - dd if=mountpoint/usr/lib/u-boot/${SUBARCH}/u-boot.toc1 of=$loader2 + # Since version 2022.10 U-Boot SPL and U-Boot are installed onto the same partition. + # Package nezha-boot0 is not needed anymore. + loader1="/dev/mapper${loop_device///dev/}p13" + dd if=mountpoint/usr/lib/u-boot/${SUBARCH}/u-boot-sunxi-with-spl.bin of=$loader1 # Provide end-user modifyable CIDATA cidata_dev="/dev/mapper${loop_device///dev/}p12" setup_cidata "${cidata_dev}" From 85cbc6abcdd30ec011b34b5bfffab31be5ab2a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Mon, 9 Jan 2023 14:11:28 +0100 Subject: [PATCH 09/88] Add changelog. --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 307d7efe..2e359d58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.796) UNRELEASED; urgency=medium + + [ Heinrich Schuchardt ] + * riscv64: adjust U-Boot installation for Nezha D1 and LicheeRV. Since + version 2022.10 U-Boot SPL and U-Boot are installed onto the same + partition. Package nezha-boot0 is not needed anymore. + + -- Łukasz 'sil2100' Zemczak Mon, 09 Jan 2023 14:10:22 +0100 + livecd-rootfs (2.795) lunar; urgency=medium * Don't depend on python3-launchpadlib on i386. This breaks ppa-enabled From e04a19d5959667b936ee160a95166ffcc4c29339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Mon, 9 Jan 2023 14:21:59 +0100 Subject: [PATCH 10/88] releasing package livecd-rootfs version 2.796 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2e359d58..3db75fec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.796) UNRELEASED; urgency=medium +livecd-rootfs (2.796) lunar; urgency=medium [ Heinrich Schuchardt ] * riscv64: adjust U-Boot installation for Nezha D1 and LicheeRV. Since From cf6104b94ed97415b39ef7899bbf3b38edce6461 Mon Sep 17 00:00:00 2001 From: Sean Davis Date: Fri, 13 Jan 2023 07:37:30 -0500 Subject: [PATCH 11/88] Rename task to xubuntu-desktop-minimal --- live-build/auto/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/auto/config b/live-build/auto/config index 3b12488b..5048270c 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -785,7 +785,7 @@ case $PROJECT in ;; xubuntu-minimal) - add_task install minimal standard xubuntu-core + add_task install minimal standard xubuntu-desktop-minimal add_package install xterm LIVE_TASK='xubuntu-live' case $ARCH in From 536cd09b73ab2ae6b53d52cfe012b7f7d4edc361 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Mon, 16 Jan 2023 17:12:04 +0100 Subject: [PATCH 12/88] riscv64: set attribute required partition for firmware According to the EBBR specification the GPT partitions for firmware should have attribute bit 0 (Required Partition) set. Signed-off-by: Heinrich Schuchardt --- live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 8ef4fca6..19bf5252 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -84,12 +84,15 @@ create_partitions() { --new=13:256:25575 \ --change-name=13:loader1 \ --typecode=13:B161E8AB-7D4B-4DB4-821C-4120A0554A35 \ + --attributes=13:set:0 \ --new=16:25576:32799 \ --change-name=16:loader2b \ --typecode=16:F79E76D9-AC98-418B-8F31-E17EA24FF07C \ + --attributes=16:set:0 \ --new=14:32800:43007 \ --change-name=14:loader2 \ --typecode=14:F4FA3898-3478-4941-887D-FCEC4E9E3C05 \ + --attributes=14:set:0 \ --new=15::+106M \ --typecode=15:ef00 \ --change-name=15:ESP \ @@ -104,6 +107,7 @@ create_partitions() { --new=13:256:25575 \ --change-name=13:loader \ --typecode=13:ef02 \ + --attributes=13:set:0 \ --new=15::+106M \ --typecode=15:ef00 \ --change-name=15:ESP \ @@ -132,9 +136,11 @@ create_partitions() { --new=13:34:2081 \ --change-name=13:loader1 \ --typecode=13:5B193300-FC78-40CD-8002-E86C45580B47 \ + --attributes=13:set:0 \ --new=14:2082:10239 \ --change-name=14:loader2 \ --typecode=14:2E54B353-1271-4842-806F-E436D6AF6985 \ + --attributes=14:set:0 \ --new=15::+106M \ --typecode=15:ef00 \ --new=12::+4M \ From 6cf691e25bb5fc0c3a29e747ca053dfe8e85d885 Mon Sep 17 00:00:00 2001 From: Sean Davis Date: Sat, 21 Jan 2023 11:51:20 -0600 Subject: [PATCH 13/88] Make xubuntu minimal a subproject --- debian/tests/default-bootstraps | 2 +- live-build/auto/config | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 76869366..7b203c02 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -39,7 +39,7 @@ ALL_TRIPLETS=" ubuntu-netbook:: ubuntu-server:live:ubuntu-server xubuntu:: - xubuntu-minimal::" + xubuntu:minimal:" if [ -z "$SELECTED_TRIPLETS" ]; then SELECTED_TRIPLETS=" diff --git a/live-build/auto/config b/live-build/auto/config index 5048270c..2e0fda8a 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -656,7 +656,7 @@ case $PROJECT in kubuntu|kubuntu-dvd|kubuntu-plasma5|ubuntu-gnome|ubuntu-budgie|ubuntukylin) COMPONENTS='main restricted universe' ;; - xubuntu|xubuntu-minimal|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) + xubuntu|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) COMPONENTS='main restricted universe multiverse' ;; esac @@ -776,16 +776,14 @@ case $PROJECT in ;; xubuntu) - add_task install minimal standard xubuntu-desktop - add_package install xterm - LIVE_TASK='xubuntu-live' - case $ARCH in - amd64) KERNEL_FLAVOURS=generic ;; + case ${SUBPROJECT:-} in + minimal) + add_task install minimal standard xubuntu-desktop-minimal + ;; + *) + add_task install minimal standard xubuntu-desktop + ;; esac - ;; - - xubuntu-minimal) - add_task install minimal standard xubuntu-desktop-minimal add_package install xterm LIVE_TASK='xubuntu-live' case $ARCH in From fb57bd4beabad700de61592973d41ead2f7ba522 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 1 Feb 2023 07:43:20 -0800 Subject: [PATCH 14/88] Drop dependency on rsync, not used in a very long time and lets us drop rsync on i386. --- debian/changelog | 7 +++++++ debian/control | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3db75fec..fb303b47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.797) UNRELEASED; urgency=medium + + * Drop dependency on rsync, not used in a very long time and lets us drop + rsync on i386. + + -- Steve Langasek Wed, 01 Feb 2023 07:42:55 -0800 + livecd-rootfs (2.796) lunar; urgency=medium [ Heinrich Schuchardt ] diff --git a/debian/control b/debian/control index 560a77e5..d1d6ee66 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,6 @@ Depends: ${misc:Depends}, python3-launchpadlib [!i386], python3-yaml, qemu-utils [!i386], - rsync, snapd (>= 2.39) [!i386], squashfs-tools (>= 1:3.3-1), sudo, From e2c06f910901089ed40fa6211b7e22fda400a744 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 1 Feb 2023 07:44:39 -0800 Subject: [PATCH 15/88] releasing package livecd-rootfs version 2.797 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fb303b47..af4027d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -livecd-rootfs (2.797) UNRELEASED; urgency=medium +livecd-rootfs (2.797) lunar; urgency=medium * Drop dependency on rsync, not used in a very long time and lets us drop rsync on i386. - -- Steve Langasek Wed, 01 Feb 2023 07:42:55 -0800 + -- Steve Langasek Wed, 01 Feb 2023 07:44:33 -0800 livecd-rootfs (2.796) lunar; urgency=medium From dc3f8a6ea0ab362d0b9d7cf329c00398b81bd818 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Tue, 7 Feb 2023 20:58:53 +0000 Subject: [PATCH 16/88] ubuntu-cpc: set default ext4 mount option commit=30 This allows to consolidate linux-kvm and linux-generic kernel flavours. This brings the perfomance benefit of linux-kvm flavour to all cloud and pre-installed images. It does trade data-safety. LP: #2006511 Signed-off-by: Dimitri John Ledkov --- live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot index 3d780e6e..9a25c0a0 100755 --- a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot @@ -72,7 +72,7 @@ if [ -n "${root_fs_label}" ]; then sed -i "s,^[^#${bl}]*\([${bl}]*/[${bl}].*\),${lstr}\1," "${rootd}/etc/fstab" fi cat > /etc/fstab << EOM -LABEL=cloudimg-rootfs / ext4 discard,errors=remount-ro 0 1 +LABEL=cloudimg-rootfs / ext4 discard,commit=30,errors=remount-ro 0 1 EOM # for quantal and newer, add /etc/overlayroot.local.conf From ee843c14de8a549850908ec2274d26b3266f4c20 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Fri, 10 Feb 2023 10:41:52 +0000 Subject: [PATCH 17/88] RISC-V: rename cmdline.cfg to 10_cmdline.cfg Using numbered configuration fragments makes the order of application easier to track Signed-off-by: Heinrich Schuchardt --- live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 +- .../hooks.d/base/riscv64/grub/{cmdline.cfg => 10_cmdline.cfg} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/{cmdline.cfg => 10_cmdline.cfg} (100%) diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 8ef4fca6..b1bf2472 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -243,7 +243,7 @@ install_grub() { local my_d=$(dirname $(readlink -f ${0})) echo "Adjusting GRUB defaults for ${ARCH}" mkdir -p mountpoint/etc/default/grub.d/ - cp ${my_d}/riscv64/grub/cmdline.cfg mountpoint/etc/default/grub.d/ + cp ${my_d}/riscv64/grub/10_cmdline.cfg mountpoint/etc/default/grub.d/ case "${SUBARCH}" in "icicle") echo "Installing GRUB for ${SUBARCH} board" diff --git a/live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/cmdline.cfg b/live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/10_cmdline.cfg similarity index 100% rename from live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/cmdline.cfg rename to live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/10_cmdline.cfg From 0924d50aeed3004fcfdff78d412856c301b1ee3c Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Fri, 10 Feb 2023 10:53:00 +0000 Subject: [PATCH 18/88] RISC-V: avoid soft lockup Radeon GPUs with GRUB With Radeon GPUs and kernel 5.19 a soft lockup was observed. Increase the watchdog threshold. Signed-off-by: Heinrich Schuchardt --- live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 ++ .../hooks.d/base/riscv64/grub/90_watchdog-thresh.cfg | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/90_watchdog-thresh.cfg diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index b1bf2472..4c1341d4 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -247,6 +247,7 @@ install_grub() { case "${SUBARCH}" in "icicle") echo "Installing GRUB for ${SUBARCH} board" + cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/ # flash-kernel is needed to install the dtb for update-grub: it uses the # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot, # the model value is wrong and we need to use /etc/flash-kernel/machine instead. @@ -367,6 +368,7 @@ EOF setup_cinocloud mountpoint ;; *) + cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/ chroot mountpoint apt-get install -qqy u-boot-menu #grub-efi-riscv64 efi_target=riscv64-efi chroot mountpoint u-boot-update diff --git a/live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/90_watchdog-thresh.cfg b/live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/90_watchdog-thresh.cfg new file mode 100644 index 00000000..e9988e50 --- /dev/null +++ b/live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/90_watchdog-thresh.cfg @@ -0,0 +1,3 @@ +# When booting with Radeon GPUs a soft lockup was observed. Increase the +# watchdog threshhold. +GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT sysctl.kernel.watchdog_thresh=60" From 55c7d5720da685c484ffafa3c196a92bc0e45895 Mon Sep 17 00:00:00 2001 From: Erich Eickmeyer Date: Sun, 12 Feb 2023 10:03:13 -0800 Subject: [PATCH 19/88] Bring back Edubuntu --- debian/tests/default-bootstraps | 1 + live-build/auto/config | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 9e1fc5f6..7a827d9f 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -13,6 +13,7 @@ fi # Listed subprojects can be combined with other projects as well, # but this list gives reasonable coverage. ALL_TRIPLETS=" + edubuntu:: kubuntu:: kubuntu-dvd:: kubuntu-plasma5:: diff --git a/live-build/auto/config b/live-build/auto/config index 1722e98b..3570c9a7 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -653,7 +653,7 @@ case $PROJECT in ubuntu-server) COMPONENTS='main' ;; - kubuntu|kubuntu-dvd|kubuntu-plasma5|ubuntu-gnome|ubuntu-budgie|ubuntukylin) + kubuntu|kubuntu-dvd|kubuntu-plasma5|edubuntu|ubuntu-gnome|ubuntu-budgie|ubuntukylin) COMPONENTS='main restricted universe' ;; xubuntu|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) @@ -775,6 +775,11 @@ case $PROJECT in add_chroot_hook remove-gnome-icon-cache ;; + edubuntu) + add_task install minimal standard ubuntu-minimal edubuntu-desktop-gnome + LIVE_TASK='edubuntu-live' + ;; + xubuntu) add_task install minimal standard xubuntu-desktop add_package install xterm From eea1308301ba09898c1474e21ad44a11b2d5b91c Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Fri, 10 Feb 2023 11:00:47 +0000 Subject: [PATCH 20/88] RISC-V: avoid soft lockup Radeon GPUs with u-boot-menu For the SiFive HiFive Unmatched board we create a pre-installed image using u-boot-menu. Increase the watchdog threshold in this case too. Signed-off-by: Heinrich Schuchardt --- live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 ++ .../hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf | 1 + .../hooks.d/base/riscv64/u-boot-menu/90_watchdog-thresh.conf | 3 +++ 3 files changed, 6 insertions(+) create mode 100644 live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf create mode 100644 live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/90_watchdog-thresh.conf diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 4c1341d4..5bf703c9 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -370,6 +370,8 @@ EOF *) cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/ chroot mountpoint apt-get install -qqy u-boot-menu #grub-efi-riscv64 + mkdir -p mountpoint/etc/u-boot-menu/conf.d/ + cp ${my_d}/riscv64/u-boot-menu/*.conf mountpoint/etc/u-boot-menu/conf.d/ efi_target=riscv64-efi chroot mountpoint u-boot-update u_boot_arch="${SUBARCH}" diff --git a/live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf b/live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf new file mode 100644 index 00000000..380be66e --- /dev/null +++ b/live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf @@ -0,0 +1 @@ +U_BOOT_PARAMETERS="ro efi=debug earlycon" diff --git a/live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/90_watchdog-thresh.conf b/live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/90_watchdog-thresh.conf new file mode 100644 index 00000000..d6340d33 --- /dev/null +++ b/live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/90_watchdog-thresh.conf @@ -0,0 +1,3 @@ +# When booting with Radeon GPUs a soft lockup was observed. Increase the +# watchdog threshhold. +U_BOOT_PARAMETERS="$U_BOOT_PARAMETERS sysctl.kernel.watchdog_thresh=60" From a1598f767b2604bdcd6447526c800505b95fe899 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 13 Feb 2023 21:07:23 -0800 Subject: [PATCH 21/88] Changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index af4027d6..cfa97641 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.798) UNRELEASED; urgency=medium + + * Add xubuntu minimal subproject. + + -- Steve Langasek Mon, 13 Feb 2023 21:07:00 -0800 + livecd-rootfs (2.797) lunar; urgency=medium * Drop dependency on rsync, not used in a very long time and lets us drop From 4a1ddcedaa565c435267a98100987ef9fd941717 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 13 Feb 2023 21:07:33 -0800 Subject: [PATCH 22/88] releasing package livecd-rootfs version 2.798 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cfa97641..3c2da54d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -livecd-rootfs (2.798) UNRELEASED; urgency=medium +livecd-rootfs (2.798) lunar; urgency=medium * Add xubuntu minimal subproject. - -- Steve Langasek Mon, 13 Feb 2023 21:07:00 -0800 + -- Steve Langasek Mon, 13 Feb 2023 21:07:27 -0800 livecd-rootfs (2.797) lunar; urgency=medium From d95b3badf03e53b5928e0adeefd680167bd46620 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 14 Feb 2023 15:55:38 -0800 Subject: [PATCH 23/88] Changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3c2da54d..c8088dbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.799) UNRELEASED; urgency=medium + + * Reintroduce edubuntu. + + -- Steve Langasek Tue, 14 Feb 2023 15:55:28 -0800 + livecd-rootfs (2.798) lunar; urgency=medium * Add xubuntu minimal subproject. From af442dd1aac3d8a961b389ced7460dcb10f75b98 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 14 Feb 2023 15:55:47 -0800 Subject: [PATCH 24/88] releasing package livecd-rootfs version 2.799 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c8088dbd..93b30427 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -livecd-rootfs (2.799) UNRELEASED; urgency=medium +livecd-rootfs (2.799) lunar; urgency=medium * Reintroduce edubuntu. - -- Steve Langasek Tue, 14 Feb 2023 15:55:28 -0800 + -- Steve Langasek Tue, 14 Feb 2023 15:55:41 -0800 livecd-rootfs (2.798) lunar; urgency=medium From 199644871f8d29bf619cd3c1773535d030dd539c Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Mon, 20 Feb 2023 11:58:07 +0100 Subject: [PATCH 25/88] WSL: do not depend on standard anymore. Evolve the seed to only ship the specific part useful to WSL users. This allows to trim down the image size. Co-authored-by: Jean-Baptiste Lallement --- live-build/auto/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/auto/config b/live-build/auto/config index 59fc25a2..35e1cb73 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -928,7 +928,7 @@ case $PROJECT in ;; ubuntu-wsl) - add_task install minimal standard ubuntu-wsl + add_task install minimal ubuntu-wsl OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" KERNEL_FLAVOURS=none BINARY_REMOVE_LINUX=false From c02c5e43da0d20a987716c70e2addd3bc68aa820 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Mon, 20 Feb 2023 12:00:19 +0100 Subject: [PATCH 26/88] releasing package livecd-rootfs version 2.800 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 93b30427..9f179400 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.800) lunar; urgency=medium + + * WSL: do not depend on standard anymore. + Evolve the seed to only ship the specific part useful to WSL users. This + allows to trim down the image size. + + -- Didier Roche Mon, 20 Feb 2023 11:59:25 +0100 + livecd-rootfs (2.799) lunar; urgency=medium * Reintroduce edubuntu. From e2fdac3b9519afe148830de2bbf781431b01296b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Thu, 23 Feb 2023 16:28:45 +0100 Subject: [PATCH 27/88] Add changelog. --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9f179400..61c9d508 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.801) UNRELEASED; urgency=medium + + [ Heinrich Schuchardt ] + * RISC-V: avoid soft lockup Radeon GPUs. With Radeon GPUs and kernel 5.19 a + soft lockup was observed. Increase the watchdog threshold. + + -- Łukasz 'sil2100' Zemczak Thu, 23 Feb 2023 16:28:00 +0100 + livecd-rootfs (2.800) lunar; urgency=medium * WSL: do not depend on standard anymore. From 1ec696a84258e37b3113935c43c1b9c80ec1dac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Thu, 23 Feb 2023 19:32:10 +0100 Subject: [PATCH 28/88] Add ubuntucinnamon. --- debian/changelog | 5 ++++- debian/tests/default-bootstraps | 1 + live-build/auto/config | 7 ++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 61c9d508..62b1c0de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,10 @@ livecd-rootfs (2.801) UNRELEASED; urgency=medium * RISC-V: avoid soft lockup Radeon GPUs. With Radeon GPUs and kernel 5.19 a soft lockup was observed. Increase the watchdog threshold. - -- Łukasz 'sil2100' Zemczak Thu, 23 Feb 2023 16:28:00 +0100 + [ Łukasz 'sil2100' Zemczak ] + * Add ubuntucinnamon to the supported flavours. + + -- Łukasz 'sil2100' Zemczak Thu, 23 Feb 2023 19:31:12 +0100 livecd-rootfs (2.800) lunar; urgency=medium diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index fa345387..9d63d7a0 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -27,6 +27,7 @@ ALL_TRIPLETS=" ubuntu-budgie:: ubuntu-budgie-desktop:: ubuntu-budgie-live:: + ubuntucinnamon:: ubuntu-core:system-image:ubuntu-core ubuntu-cpc::ubuntu-cpc ubuntu-cpc:minimized:ubuntu-cpc diff --git a/live-build/auto/config b/live-build/auto/config index 35e1cb73..698648e6 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -653,7 +653,7 @@ case $PROJECT in ubuntu-server) COMPONENTS='main' ;; - kubuntu|kubuntu-dvd|kubuntu-plasma5|edubuntu|ubuntu-gnome|ubuntu-budgie|ubuntukylin) + kubuntu|kubuntu-dvd|kubuntu-plasma5|edubuntu|ubuntu-gnome|ubuntu-budgie|ubuntukylin|ubuntucinnamon) COMPONENTS='main restricted universe' ;; xubuntu|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity) @@ -780,6 +780,11 @@ case $PROJECT in LIVE_TASK='edubuntu-live' ;; + ubuntucinnamon) + add_task install minimal standard ubuntucinnamon-desktop + LIVE_TASK='ubuntucinnamon-live' + ;; + xubuntu) case ${SUBPROJECT:-} in minimal) From 957f157b4aaebeff0b7cc071ede6f6aa3694cdf2 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Fri, 24 Feb 2023 12:02:02 +0000 Subject: [PATCH 29/88] ubuntu-cpc: set default ext4 mount option commit=30 (LP: #2006511) --- debian/changelog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 62b1c0de..dcbd0673 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,10 @@ livecd-rootfs (2.801) UNRELEASED; urgency=medium [ Łukasz 'sil2100' Zemczak ] * Add ubuntucinnamon to the supported flavours. - -- Łukasz 'sil2100' Zemczak Thu, 23 Feb 2023 19:31:12 +0100 + [ Dimitri John Ledkov ] + * ubuntu-cpc: set default ext4 mount option commit=30 (LP: #2006511) + + -- Dimitri John Ledkov Fri, 24 Feb 2023 12:01:52 +0000 livecd-rootfs (2.800) lunar; urgency=medium From 88f8976e6498243eebb652af8e0797ea12541435 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Fri, 24 Feb 2023 12:19:26 +0000 Subject: [PATCH 30/88] Terrible hack workaround for clearing out the non-offline apt cache for desktop related images. --- debian/changelog | 5 ++++- live-build/auto/build | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dcbd0673..32e83b89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,9 +6,12 @@ livecd-rootfs (2.801) UNRELEASED; urgency=medium [ Łukasz 'sil2100' Zemczak ] * Add ubuntucinnamon to the supported flavours. + * Terrible hack workaround for clearing out the non-offline apt cache + for desktop related images. [ Dimitri John Ledkov ] - * ubuntu-cpc: set default ext4 mount option commit=30 (LP: #2006511) + * ubuntu-cpc: set default ext4 mount option commit=30 (LP: #2006511). + * Cherry-pick jammy point release fixes. -- Dimitri John Ledkov Fri, 24 Feb 2023 12:01:52 +0000 diff --git a/live-build/auto/build b/live-build/auto/build index 4a0dd317..7b984d92 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -482,6 +482,18 @@ EOF clean_debian_chroot fi + # XXX: Terrible last-minute hack to work-around issue LP: #2008082 ! + # This basically needs to be done better, we simply need to make sure + # that we don't update the cache after lb cleans up. Since identifying + # that might take a moment, for now, for flavors that are generally + # affected by this, we manually clear out the archive-related Packages + # files in the cache. + case $PROJECT in + ubuntu|xubuntu|kubuntu|ubuntu-budgie|ubuntukylin|ubuntu-mate) + rm -f chroot/var/lib/apt/lists/*ubuntu.com*_Packages + ;; + esac + if [ -n "${PASSES}" ]; then PATH="config/:$PATH" lb binary_layered "$@" else From 3fa9d74b79cb7c7b8fc58bd1b90df8a40f050212 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Fri, 24 Feb 2023 12:20:14 +0000 Subject: [PATCH 31/88] releasing package livecd-rootfs version 2.801 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 32e83b89..55a51f8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.801) UNRELEASED; urgency=medium +livecd-rootfs (2.801) lunar; urgency=medium [ Heinrich Schuchardt ] * RISC-V: avoid soft lockup Radeon GPUs. With Radeon GPUs and kernel 5.19 a @@ -13,7 +13,7 @@ livecd-rootfs (2.801) UNRELEASED; urgency=medium * ubuntu-cpc: set default ext4 mount option commit=30 (LP: #2006511). * Cherry-pick jammy point release fixes. - -- Dimitri John Ledkov Fri, 24 Feb 2023 12:01:52 +0000 + -- Dimitri John Ledkov Fri, 24 Feb 2023 12:20:04 +0000 livecd-rootfs (2.800) lunar; urgency=medium From 4dbeba4ba38316590eb015bf6c769c62ed0123f3 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 24 Feb 2023 17:47:51 -0800 Subject: [PATCH 32/88] Address the fact that debootstrap doesn't follow Recommends and as a result we're missing several Recommends that should be installed by default and are on upgrades but not on new installs. This is not applied to minimized images, which don't follow Recommends; but does get separately applied to the ubuntu-server full squashfs. --- debian/changelog | 10 ++++++++++ live-build/auto/build | 10 ++++++++++ .../ubuntu-server/hooks/01-unminimize.chroot_early | 7 +++++++ 3 files changed, 27 insertions(+) diff --git a/debian/changelog b/debian/changelog index 55a51f8d..a87a3feb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +livecd-rootfs (2.802) UNRELEASED; urgency=medium + + * Address the fact that debootstrap doesn't follow Recommends and as a + result we're missing several Recommends that should be installed by + default and are on upgrades but not on new installs. This is not + applied to minimized images, which don't follow Recommends; but does get + separately applied to the ubuntu-server full squashfs. + + -- Steve Langasek Fri, 24 Feb 2023 17:46:47 -0800 + livecd-rootfs (2.801) lunar; urgency=medium [ Heinrich Schuchardt ] diff --git a/live-build/auto/build b/live-build/auto/build index 7b984d92..83324c25 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -327,6 +327,16 @@ EOF chmod +x chroot/usr/bin/man fi + if [ "${SUBPROJECT:-}" != minimized ] \ + && [ "${PROJECT}" != "ubuntu-server" ] + then + # debootstrap doesn't handle Recommends and fixing this is + # non-trivial, so install missing Recommends here + echo "Installing any missing recommends" + Chroot chroot "env DEBIAN_FRONTEND=noninteractive \ + apt-get -y --fix-policy install" + fi + if [ -n "${PASSES}" ]; then PATH="config/:$PATH" lb chroot_layered "$@" else diff --git a/live-build/ubuntu-server/hooks/01-unminimize.chroot_early b/live-build/ubuntu-server/hooks/01-unminimize.chroot_early index f70b59b4..ec91fdc8 100755 --- a/live-build/ubuntu-server/hooks/01-unminimize.chroot_early +++ b/live-build/ubuntu-server/hooks/01-unminimize.chroot_early @@ -18,3 +18,10 @@ ln -s /bin/true /usr/bin/snap yes | /usr/local/sbin/unminimize rm /usr/bin/snap dpkg-divert --remove --rename /usr/bin/snap + +# Fix up missing recommends. Other non-layered flavors handle this in +# live-build/auto/build, but we need to do it here. Also, there are +# additional recommends missing from server-minimal that wouldn't be +# corrected by a fix to debootstrap to handle Recommends. +echo "Installing any missing recommends" +env DEBIAN_FRONTEND=noninteractive apt-get -y --fix-policy install From 722b4d33d757b4d2fd3749852d1e5e8ed73f43f9 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 24 Feb 2023 17:47:58 -0800 Subject: [PATCH 33/88] releasing package livecd-rootfs version 2.802 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a87a3feb..13c27b28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.802) UNRELEASED; urgency=medium +livecd-rootfs (2.802) lunar; urgency=medium * Address the fact that debootstrap doesn't follow Recommends and as a result we're missing several Recommends that should be installed by @@ -6,7 +6,7 @@ livecd-rootfs (2.802) UNRELEASED; urgency=medium applied to minimized images, which don't follow Recommends; but does get separately applied to the ubuntu-server full squashfs. - -- Steve Langasek Fri, 24 Feb 2023 17:46:47 -0800 + -- Steve Langasek Fri, 24 Feb 2023 17:47:54 -0800 livecd-rootfs (2.801) lunar; urgency=medium From 6a6ac87e24ff724c2283e7e39ed415976cfaab57 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 24 Feb 2023 20:57:00 -0800 Subject: [PATCH 34/88] Fix wrong task name for xubuntu-minimal. --- debian/changelog | 6 ++++++ live-build/auto/config | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 13c27b28..9aac0950 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.803) UNRELEASED; urgency=medium + + * Fix wrong task name for xubuntu-minimal. + + -- Steve Langasek Fri, 24 Feb 2023 20:56:48 -0800 + livecd-rootfs (2.802) lunar; urgency=medium * Address the fact that debootstrap doesn't follow Recommends and as a diff --git a/live-build/auto/config b/live-build/auto/config index 698648e6..6b6e44a8 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -788,7 +788,7 @@ case $PROJECT in xubuntu) case ${SUBPROJECT:-} in minimal) - add_task install minimal standard xubuntu-desktop-minimal + add_task install minimal standard xubuntu-minimal ;; *) add_task install minimal standard xubuntu-desktop From d4fe8aedc1803b08d1030ec628a18701310a5e35 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 24 Feb 2023 21:05:46 -0800 Subject: [PATCH 35/88] Fix edubuntu build: ubuntu-minimal is not a task and minimal is already declared. --- debian/changelog | 2 ++ live-build/auto/config | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9aac0950..847f5fa2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ livecd-rootfs (2.803) UNRELEASED; urgency=medium * Fix wrong task name for xubuntu-minimal. + * Fix edubuntu build: ubuntu-minimal is not a task and minimal is already + declared. -- Steve Langasek Fri, 24 Feb 2023 20:56:48 -0800 diff --git a/live-build/auto/config b/live-build/auto/config index 6b6e44a8..9829cc78 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -776,7 +776,7 @@ case $PROJECT in ;; edubuntu) - add_task install minimal standard ubuntu-minimal edubuntu-desktop-gnome + add_task install minimal standard edubuntu-desktop-gnome LIVE_TASK='edubuntu-live' ;; From 0b0eb5a583ef764ce3500f3016073852b35f25b1 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 24 Feb 2023 21:05:50 -0800 Subject: [PATCH 36/88] releasing package livecd-rootfs version 2.803 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 847f5fa2..b669b5d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -livecd-rootfs (2.803) UNRELEASED; urgency=medium +livecd-rootfs (2.803) lunar; urgency=medium * Fix wrong task name for xubuntu-minimal. * Fix edubuntu build: ubuntu-minimal is not a task and minimal is already declared. - -- Steve Langasek Fri, 24 Feb 2023 20:56:48 -0800 + -- Steve Langasek Fri, 24 Feb 2023 21:05:48 -0800 livecd-rootfs (2.802) lunar; urgency=medium From b4190c7b97fe7e0364cdcef400f2bf221c22241c Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 24 Feb 2023 21:11:53 -0800 Subject: [PATCH 37/88] Clarified with Erich that edubuntu should install ubuntu-desktop-minimal task. --- debian/changelog | 7 +++++++ live-build/auto/config | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b669b5d1..1227729a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.804) UNRELEASED; urgency=medium + + * Clarified with Erich that edubuntu should install ubuntu-desktop-minimal + task. + + -- Steve Langasek Fri, 24 Feb 2023 21:11:28 -0800 + livecd-rootfs (2.803) lunar; urgency=medium * Fix wrong task name for xubuntu-minimal. diff --git a/live-build/auto/config b/live-build/auto/config index 9829cc78..157f8b47 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -776,7 +776,7 @@ case $PROJECT in ;; edubuntu) - add_task install minimal standard edubuntu-desktop-gnome + add_task install minimal standard ubuntu-desktop-minimal edubuntu-desktop-gnome LIVE_TASK='edubuntu-live' ;; From bd0749c905371b4e835cafe64a9fccce6a0d1833 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 24 Feb 2023 21:12:00 -0800 Subject: [PATCH 38/88] releasing package livecd-rootfs version 2.804 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1227729a..4fb74a0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -livecd-rootfs (2.804) UNRELEASED; urgency=medium +livecd-rootfs (2.804) lunar; urgency=medium * Clarified with Erich that edubuntu should install ubuntu-desktop-minimal task. - -- Steve Langasek Fri, 24 Feb 2023 21:11:28 -0800 + -- Steve Langasek Fri, 24 Feb 2023 21:11:56 -0800 livecd-rootfs (2.803) lunar; urgency=medium From 573422e46f060a0d3fc465fe791c4b71b98caa6f Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Mon, 27 Feb 2023 21:49:22 +1300 Subject: [PATCH 39/88] add changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4fb74a0d..dc7ff761 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.805) UNRELEASED; urgency=medium + + * riscv64: set attribute required partition for firmware. + + -- Michael Hudson-Doyle Mon, 27 Feb 2023 21:47:59 +1300 + livecd-rootfs (2.804) lunar; urgency=medium * Clarified with Erich that edubuntu should install ubuntu-desktop-minimal From 91d635d8448e3e203b6cbd2a892705214751bf9b Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Mon, 27 Feb 2023 21:49:46 +1300 Subject: [PATCH 40/88] releasing package livecd-rootfs version 2.805 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index dc7ff761..55760cf5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -livecd-rootfs (2.805) UNRELEASED; urgency=medium +livecd-rootfs (2.805) lunar; urgency=medium * riscv64: set attribute required partition for firmware. - -- Michael Hudson-Doyle Mon, 27 Feb 2023 21:47:59 +1300 + -- Michael Hudson-Doyle Mon, 27 Feb 2023 21:49:27 +1300 livecd-rootfs (2.804) lunar; urgency=medium From 91e1771b037383656964cdcfd9ada0d9808b6943 Mon Sep 17 00:00:00 2001 From: Sean Davis Date: Tue, 28 Feb 2023 05:26:51 -0500 Subject: [PATCH 41/88] Remove snap base seed for xubuntu:minimal --- live-build/auto/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/live-build/auto/config b/live-build/auto/config index 157f8b47..094aeddd 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1054,6 +1054,8 @@ case $PROJECT:${SUBPROJECT:-} in ;; ubuntu-oci:*) ;; + xubuntu:minimal) + ;; *) BASE_SEED='desktop' ;; From 33e7560e1fa0a4e26c76018f58a74a88422b4a0f Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 28 Feb 2023 08:00:03 -0800 Subject: [PATCH 42/88] Changelog --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 55760cf5..36e4d284 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.806) UNRELEASED; urgency=medium + + [ Sean Davis ] + * Remove snap base seed for xubuntu:minimal + + -- Steve Langasek Tue, 28 Feb 2023 07:59:49 -0800 + livecd-rootfs (2.805) lunar; urgency=medium * riscv64: set attribute required partition for firmware. From 381a5b956ee0d446e1065fe87bfcd5570979eee9 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 28 Feb 2023 08:00:12 -0800 Subject: [PATCH 43/88] releasing package livecd-rootfs version 2.806 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 36e4d284..a2b9df8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -livecd-rootfs (2.806) UNRELEASED; urgency=medium +livecd-rootfs (2.806) lunar; urgency=medium [ Sean Davis ] * Remove snap base seed for xubuntu:minimal - -- Steve Langasek Tue, 28 Feb 2023 07:59:49 -0800 + -- Steve Langasek Tue, 28 Feb 2023 08:00:08 -0800 livecd-rootfs (2.805) lunar; urgency=medium From 63317374e59f9cdb27f1301b729be12d073b8816 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Thu, 2 Mar 2023 18:11:03 +0000 Subject: [PATCH 44/88] auto/config: Add support for ubuntu core arm64 generic images LP: #2009067 Signed-off-by: Dimitri John Ledkov --- live-build/auto/config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/live-build/auto/config b/live-build/auto/config index 094aeddd..6e12203d 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -405,6 +405,8 @@ case $IMAGEFORMAT in MODEL=pi3-arm64 ;; armhf+cm3) MODEL=cm3 ;; + arm64+*) + MODEL=pc-arm64 ;; *) echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2 exit 1 @@ -423,7 +425,7 @@ case $IMAGEFORMAT in CHANNEL="${CHANNEL:-edge}" case $MODEL in - pc-amd64) + pc-amd64|pc-arm64) if [ -z "${SUBARCH:-}" ]; then # This is to make sure there's enough writable space UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M" From 95adff2ba13d7cfafb2c95c28616a275134296a7 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Thu, 2 Mar 2023 18:18:35 +0000 Subject: [PATCH 45/88] releasing package livecd-rootfs version 2.807 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index a2b9df8f..d39e2a29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.807) lunar; urgency=medium + + * auto/config: Add support for ubuntu core arm64 generic images (LP: #2009067) + + -- Dimitri John Ledkov Thu, 02 Mar 2023 18:18:18 +0000 + livecd-rootfs (2.806) lunar; urgency=medium [ Sean Davis ] From f10fd681247fc883f39ccd6b86613df8a9d45b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Fri, 3 Mar 2023 15:08:09 +0100 Subject: [PATCH 46/88] Add ubuntucinnamon to the seed-determination switch-case. --- debian/changelog | 6 ++++++ live-build/auto/config | 3 +++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index d39e2a29..dd92b1a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.808) UNRELEASED; urgency=medium + + * Add ubuntucinnamon to the seed-determination switch-case. + + -- Łukasz 'sil2100' Zemczak Fri, 03 Mar 2023 15:07:06 +0100 + livecd-rootfs (2.807) lunar; urgency=medium * auto/config: Add support for ubuntu core arm64 generic images (LP: #2009067) diff --git a/live-build/auto/config b/live-build/auto/config index 6e12203d..021a267c 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -646,6 +646,9 @@ case $PROJECT in ubuntustudio*) SEED=ubuntustudio.$SUITE ;; + ubuntucinnamon*) + SEED=ubuntucinnamon.$SUITE + ;; *) SEED=ubuntu.$SUITE ;; From b2008366b70c17a3f4feb5f65a0dd6784c64328e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Fri, 3 Mar 2023 15:08:55 +0100 Subject: [PATCH 47/88] releasing package livecd-rootfs version 2.808 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dd92b1a0..a4eb7944 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.808) UNRELEASED; urgency=medium +livecd-rootfs (2.808) lunar; urgency=medium * Add ubuntucinnamon to the seed-determination switch-case. From 77982219572e75ed9d8d8c33cca3b805d33138fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Mon, 6 Mar 2023 11:28:30 +0100 Subject: [PATCH 48/88] Do not use the ubuntucinnamon-desktop task for cinnamon builds, it doesn't seem to be present in the archive yet. Use the metapackage instead, which seems like a better way forward anyway. --- debian/changelog | 8 ++++++++ live-build/auto/config | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a4eb7944..ecefb4a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.809) UNRELEASED; urgency=medium + + * Do not use the ubuntucinnamon-desktop task for cinnamon builds, it doesn't + seem to be present in the archive yet. Use the metapackage instead, which + seems like a better way forward anyway. + + -- Łukasz 'sil2100' Zemczak Mon, 06 Mar 2023 11:27:02 +0100 + livecd-rootfs (2.808) lunar; urgency=medium * Add ubuntucinnamon to the seed-determination switch-case. diff --git a/live-build/auto/config b/live-build/auto/config index 021a267c..63e826f0 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -786,7 +786,11 @@ case $PROJECT in ;; ubuntucinnamon) - add_task install minimal standard ubuntucinnamon-desktop + add_task install minimal standard + # The ubuntucinnamon task is not yet baked into the archive, + # but using the metapackage directly should be as good, if not + # better. + add_package install ubuntucinnamon-desktop LIVE_TASK='ubuntucinnamon-live' ;; From 73f0355304793f672bc56efaa700a953d859d0e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Mon, 6 Mar 2023 11:43:47 +0100 Subject: [PATCH 49/88] cinnamon: don't use the live task as well. --- live-build/auto/config | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index 63e826f0..2b1ea18e 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -787,11 +787,15 @@ case $PROJECT in ubuntucinnamon) add_task install minimal standard - # The ubuntucinnamon task is not yet baked into the archive, - # but using the metapackage directly should be as good, if not - # better. add_package install ubuntucinnamon-desktop - LIVE_TASK='ubuntucinnamon-live' + # XXX: Adding live packages manually temporarily until we have + # the live task for ubuntucinnamon set up properly. + add_package live ubiquity-frontend-gtk + add_package live ubiquity-ubuntu-artwork ubiquity-slideshow-ubuntu + add_package live gtk-im-libthai ibus-hangul ibus-mozc ibus-unikey + add_package live zfsutils-linux zfs-initramfs zsys + add_package live sssd realmd adcli + add_package live gparted cifs-utils ;; xubuntu) From 0b2eedb0fc7d4b21024b7a2ce3ef56327c295318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Mon, 6 Mar 2023 11:48:44 +0100 Subject: [PATCH 50/88] Changelog adjustments. --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ecefb4a4..6ac9b58f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ livecd-rootfs (2.809) UNRELEASED; urgency=medium * Do not use the ubuntucinnamon-desktop task for cinnamon builds, it doesn't seem to be present in the archive yet. Use the metapackage instead, which - seems like a better way forward anyway. + seems like a better way forward anyway. For the live task, temporarily use + a hard-coded list of packages. -- Łukasz 'sil2100' Zemczak Mon, 06 Mar 2023 11:27:02 +0100 From 912e15c7fc4445cea1e3e314f966a08056754711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Mon, 6 Mar 2023 13:06:29 +0100 Subject: [PATCH 51/88] Explicitly define the kernel flavor for ubuntucinnamon. --- debian/changelog | 1 + live-build/auto/config | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6ac9b58f..b46db504 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ livecd-rootfs (2.809) UNRELEASED; urgency=medium seem to be present in the archive yet. Use the metapackage instead, which seems like a better way forward anyway. For the live task, temporarily use a hard-coded list of packages. + * Explicitly define the kernel flavor for ubuntucinnamon. -- Łukasz 'sil2100' Zemczak Mon, 06 Mar 2023 11:27:02 +0100 diff --git a/live-build/auto/config b/live-build/auto/config index 2b1ea18e..54510c73 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -796,6 +796,7 @@ case $PROJECT in add_package live zfsutils-linux zfs-initramfs zsys add_package live sssd realmd adcli add_package live gparted cifs-utils + KERNEL_FLAVOURS=generic ;; xubuntu) From f53e528de94a8eec2fbb01945358ebfb1c011734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Mon, 6 Mar 2023 13:07:40 +0100 Subject: [PATCH 52/88] releasing package livecd-rootfs version 2.809 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b46db504..190ab7e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.809) UNRELEASED; urgency=medium +livecd-rootfs (2.809) lunar; urgency=medium * Do not use the ubuntucinnamon-desktop task for cinnamon builds, it doesn't seem to be present in the archive yet. Use the metapackage instead, which From 0d61fce909536bea7671aacdce636290cab753d4 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Thu, 2 Feb 2023 12:47:26 -0700 Subject: [PATCH 53/88] Add ubuntu-mini-iso project --- debian/changelog | 6 ++ debian/control | 1 + live-build/auto/config | 33 ++++++-- .../ubuntu-mini-iso/hooks/01-mini-iso.binary | 77 +++++++++++++++++++ 4 files changed, 111 insertions(+), 6 deletions(-) create mode 100755 live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary diff --git a/debian/changelog b/debian/changelog index 190ab7e8..ab27a8bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.810) lunar; urgency=medium + + * Add ubuntu-mini-iso build project. + + -- Dan Bungert Mon, 06 Mar 2023 08:17:11 -0700 + livecd-rootfs (2.809) lunar; urgency=medium * Do not use the ubuntucinnamon-desktop task for cinnamon builds, it doesn't diff --git a/debian/control b/debian/control index d1d6ee66..ee6ed31a 100644 --- a/debian/control +++ b/debian/control @@ -40,6 +40,7 @@ Depends: ${misc:Depends}, u-boot-tools [armhf arm64], ubuntu-image [!i386 !riscv64], python3-vmdkstream [amd64 i386], + xorriso, xz-utils, zerofree Breaks: ubuntu-defaults-builder (<< 0.32) diff --git a/live-build/auto/config b/live-build/auto/config index 54510c73..a281291c 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -342,7 +342,7 @@ if [ -z "${IMAGEFORMAT:-}" ]; then ;; esac ;; - ubuntu-server:live) + ubuntu-server:live|ubuntu-mini-iso:) IMAGEFORMAT=plain ;; esac @@ -377,6 +377,8 @@ case $IMAGEFORMAT in ubuntu-server:live) touch config/universe-enabled ;; + ubuntu-mini-iso:) + ;; *) PREINSTALLED=true ;; @@ -591,7 +593,7 @@ if [ "$PREINSTALLED" = "true" ]; then ubuntu-server) add_package live oem-config-debconf ubiquity-frontend-debconf ;; - ubuntu-base|ubuntu-oci|ubuntu-cpc|ubuntu-wsl) + ubuntu-base|ubuntu-oci|ubuntu-cpc|ubuntu-wsl|ubuntu-mini-iso) ;; ubuntu) add_package live oem-config-gtk ubiquity-frontend-gtk @@ -655,7 +657,7 @@ case $PROJECT in esac case $PROJECT in - ubuntu-server) + ubuntu-server|ubuntu-mini-iso) COMPONENTS='main' ;; kubuntu|kubuntu-dvd|kubuntu-plasma5|edubuntu|ubuntu-gnome|ubuntu-budgie|ubuntukylin|ubuntucinnamon) @@ -938,6 +940,25 @@ case $PROJECT in PREINSTALL_POOL_SEEDS='server-ship' ;; + ubuntu-mini-iso) + OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" + + OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" + KERNEL_FLAVOURS=none + BINARY_REMOVE_LINUX=false + + add_package install mini-iso-tools openssl ca-certificates isc-dhcp-client linux-generic + case $ARCH in + amd64) + add_package install cd-boot-images-amd64 + ;; + *) + echo "unexpected architecture for $PROJECT: '$ARCH'" + exit 1 + ;; + esac + ;; + ubuntu-base) OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal" ;; @@ -1064,7 +1085,7 @@ case $PROJECT:${SUBPROJECT:-} in ubuntu-server:live) BASE_SEED='server' ;; - ubuntu-base:*|ubuntu-core:*) + ubuntu-base:*|ubuntu-core:*|ubuntu-mini-iso:) ;; ubuntu-oci:*) ;; @@ -1237,7 +1258,7 @@ if [ "${IMAGE_HAS_HARDCODED_PASSWORD:-}" = "1" ]; then fi case $PROJECT in - ubuntu-cpc|ubuntu-core|ubuntu-base|ubuntu-oci|ubuntu-wsl) + ubuntu-cpc|ubuntu-core|ubuntu-base|ubuntu-oci|ubuntu-wsl|ubuntu-mini-iso) # ubuntu-cpc gets this added in 025-create-groups.chroot, and we do # not want this group in projects that are effectively just chroots ;; @@ -1396,7 +1417,7 @@ EOF fi ;; - ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled|ubuntu-wsl:*) + ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled|ubuntu-wsl:*|ubuntu-mini-iso:*) # 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-mini-iso/hooks/01-mini-iso.binary b/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary new file mode 100755 index 00000000..6e857f9c --- /dev/null +++ b/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary @@ -0,0 +1,77 @@ +#!/bin/sh + +set -eu + +case $ARCH in + amd64) + ;; + *) + exit 0 + ;; +esac + +KERNEL=chroot/boot/vmlinuz +INITRD=chroot/boot/initrd.img + +mkdir -p "chroot/etc/initramfs-tools/conf.d" +cat > chroot/etc/initramfs-tools/conf.d/casperize.conf < ubuntu-mini-iso/amd64/tree/boot/grub/grub.cfg < ubuntu-mini-iso/$ARCH/tree/.disk/cd_type < ubuntu-mini-iso/$ARCH/tree/.disk/info < Date: Mon, 6 Mar 2023 14:04:27 -0600 Subject: [PATCH 54/88] fix: remove ipc from apparmor features in 6.1 ipc was dropped as an apparmor feature. checked by grabbing the latest lunar VM, installing the latest kernel, doing a reboot, and comparing directories and files. compared all files and the only diff is the ipc posix_mqueue --- live-build/apparmor/generic/ipc/posix_mqueue | 1 - 1 file changed, 1 deletion(-) delete mode 100644 live-build/apparmor/generic/ipc/posix_mqueue diff --git a/live-build/apparmor/generic/ipc/posix_mqueue b/live-build/apparmor/generic/ipc/posix_mqueue deleted file mode 100644 index c20f9f93..00000000 --- a/live-build/apparmor/generic/ipc/posix_mqueue +++ /dev/null @@ -1 +0,0 @@ -create read write open delete setattr getattr From 0dcada3904adbdcae38e730cae59495d75e68c9f Mon Sep 17 00:00:00 2001 From: John Chittum Date: Mon, 6 Mar 2023 14:25:04 -0600 Subject: [PATCH 55/88] open 2.810 release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 190ab7e8..d5a7d87e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.810) UNRELEASED; urgency=medium + + * set apparmor features to match kernel 6.1 + + -- jchittum Mon, 06 Mar 2023 14:24:29 -0600 + livecd-rootfs (2.809) lunar; urgency=medium * Do not use the ubuntucinnamon-desktop task for cinnamon builds, it doesn't From e88307eae8bcb144bba36659da6fdc76c87e105f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Tue, 7 Mar 2023 10:51:23 +0100 Subject: [PATCH 56/88] Revert changelog to UNRELEASED, for now. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ab27a8bb..ae8e91f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.810) lunar; urgency=medium +livecd-rootfs (2.810) UNRELEASED; urgency=medium * Add ubuntu-mini-iso build project. From e7f2ecaa89fd482b449a8dccd02738cd941dbc0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Tue, 7 Mar 2023 14:13:11 +0100 Subject: [PATCH 57/88] releasing package livecd-rootfs version 2.810 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ae8e91f4..ab27a8bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.810) UNRELEASED; urgency=medium +livecd-rootfs (2.810) lunar; urgency=medium * Add ubuntu-mini-iso build project. From 4a883c26f7d4aed79ae4a4a936f81087f1a7c29f Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Thu, 9 Mar 2023 18:10:28 +0000 Subject: [PATCH 58/88] releasing package livecd-rootfs version 2.811 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index ab27a8bb..c3039d90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.811) lunar; urgency=medium + + [ John Chittum ] + * fix: remove ipc from apparmor features in 6.1 + * open 2.810 release + + -- Dimitri John Ledkov Thu, 09 Mar 2023 18:10:05 +0000 + livecd-rootfs (2.810) lunar; urgency=medium * Add ubuntu-mini-iso build project. From ccd8441a64e473794bad93ad3c81cc1ef1392f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Tue, 14 Mar 2023 15:47:51 +0100 Subject: [PATCH 59/88] releasing package livecd-rootfs version 2.812 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index df5a7cfc..7f4ee3ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.812) UNRELEASED; urgency=medium +livecd-rootfs (2.812) lunar; urgency=medium * Inform cloud-init when network manager is in use. (LP: #1982855) From 3ad215e3f111bb77e9966ac8113fec2af1d02f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Fri, 17 Mar 2023 11:54:46 +0100 Subject: [PATCH 60/88] Forward port some intel-iot changes. --- debian/changelog | 8 ++++++++ live-build/auto/build | 3 +++ live-build/auto/config | 8 ++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f4ee3ff..9f2698f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.813) UNRELEASED; urgency=medium + + * Make sure that for devel we also use the right intel-iot kernel flavor + for the images. We don't build any for this series, but it's good to have + parity in the devel branch. + + -- Łukasz 'sil2100' Zemczak Fri, 17 Mar 2023 11:53:09 +0100 + livecd-rootfs (2.812) lunar; urgency=medium * Inform cloud-init when network manager is in use. (LP: #1982855) diff --git a/live-build/auto/build b/live-build/auto/build index 83324c25..ddbb7332 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -607,6 +607,9 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do image-intel) FLAVOUR="intel" ;; + intel-iotg*) + FLAVOUR="intel-iotg" + ;; esac KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )" if [ -z "$KVERS" ]; then diff --git a/live-build/auto/config b/live-build/auto/config index a281291c..ff44991d 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -694,7 +694,7 @@ case $PROJECT in add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages KERNEL_FLAVOURS='generic-hwe-22.04' if [ "$SUBARCH" = "intel-iot" ]; then - KERNEL_FLAVOURS='image-intel' + KERNEL_FLAVOURS='intel-iotg' fi ;; desktop-preinstalled) @@ -712,7 +712,7 @@ case $PROJECT in OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15" ;; intel-iot) - KERNEL_FLAVOURS='image-intel' + KERNEL_FLAVOURS='intel-iotg' OPTS="${OPTS:+$OPTS }--initramfs=none" OPTS="${OPTS:+$OPTS }--system=normal" OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs" @@ -1010,7 +1010,7 @@ case $PROJECT in if [ "${SUBARCH:-}" = "generic" ]; then KERNEL_FLAVOURS=generic elif [ "${SUBARCH:-}" = "intel-iot" ]; then - KERNEL_FLAVOURS=image-intel + KERNEL_FLAVOURS=intel-iotg OPTS="${OPTS:+$OPTS }--initramfs=none" fi ;; @@ -1196,7 +1196,7 @@ case $PROJECT in KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}" case $SUBARCH in intel-iot) - KERNEL_FLAVOURS='image-intel' + KERNEL_FLAVOURS='intel-iotg' ;; esac ;; From 85f93d836a3425ec604f92053aa8241f352eeca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Fri, 17 Mar 2023 12:15:05 +0100 Subject: [PATCH 61/88] Add intel-iot server image support to devel. --- debian/changelog | 2 ++ live-build/auto/config | 15 ++++++++++++--- live-build/lb_binary_layered | 19 +++++++++++-------- .../hooks/03-kernel-metapkg.chroot_early | 2 ++ .../ubuntu-server/hooks/04-kernel-bits.binary | 2 ++ 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9f2698f0..ffa66066 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ livecd-rootfs (2.813) UNRELEASED; urgency=medium * Make sure that for devel we also use the right intel-iot kernel flavor for the images. We don't build any for this series, but it's good to have parity in the devel branch. + * Add support for building intel-iot server images. Not used in lunar, but + adding to keep devel up-to-date with changes. -- Łukasz 'sil2100' Zemczak Fri, 17 Mar 2023 11:53:09 +0100 diff --git a/live-build/auto/config b/live-build/auto/config index ff44991d..4f7cf9b9 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -897,9 +897,15 @@ case $PROJECT in # the GA and HWE kernels (in separate layers) so this code is # written generically to support both even though a lot of the # time only one kernel is offered. - - # variants='ga hwe' - variants='ga' + case ${SUBARCH-} in + intel-iot) + variants='intel' + ;; + *) + # variants='ga hwe' + variants='ga' + ;; + esac for variant in $variants; do if [ "$variant" = "ga" ]; then @@ -908,6 +914,9 @@ case $PROJECT in elif [ "$variant" = "hwe" ]; then kernel_metapkg=linux-generic-hwe-$(lsb_release -sr) flavor=generic-hwe + elif [ "$variant" = "intel" ]; then + kernel_metapkg=linux-intel-iotg + flavor=intel-iotg else echo "bogus variant: $variant" exit 1 diff --git a/live-build/lb_binary_layered b/live-build/lb_binary_layered index 424f7001..f31d5e22 100755 --- a/live-build/lb_binary_layered +++ b/live-build/lb_binary_layered @@ -56,9 +56,12 @@ build_layered_squashfs () { Echo_message "lb_binary_layered: treating pass $pass" + # Per convention, we include the subarch name next to the project + PROJECT_FULL=$PROJECT${SUBARCH:+-$SUBARCH} + # Building squashfs filesystem & manifest local overlay_dir="overlay.${pass}" - base="${PWD}/livecd.${PROJECT}.${pass}" + base="${PWD}/livecd.${PROJECT_FULL}.${pass}" squashfs_f="${base}.squashfs" # We have already treated that pass @@ -113,7 +116,7 @@ build_layered_squashfs () { create_manifest "chroot" "${squashfs_f_manifest}.full" # Delta manifest - diff -NU0 ${PWD}/livecd.${PROJECT}.$(get_parent_pass $pass).manifest.full ${squashfs_f_manifest}.full|grep -v ^@ > $squashfs_f_manifest + diff -NU0 ${PWD}/livecd.${PROJECT_FULL}.$(get_parent_pass $pass).manifest.full ${squashfs_f_manifest}.full|grep -v ^@ > $squashfs_f_manifest squashfs_f_size="${base}.size" du -B 1 -s "overlay.${pass}/" | cut -f1 > "${squashfs_f_size}" @@ -121,7 +124,7 @@ build_layered_squashfs () { # We take first live pass for "global" ISO properties (used by installers and checkers): # Prepare initrd + kernel # Main manifest and size files - prefix="livecd.$PROJECT${SUBARCH:+-$SUBARCH}" + prefix="livecd.$PROJECT_FULL" if [ ! -e "${prefix}.manifest" ] && $(is_live_layer "$pass"); then totalsize=$(cat ${squashfs_f_size}) curpass="$pass" @@ -130,7 +133,7 @@ build_layered_squashfs () { # We climbed up the tree to the root layer, we are done [ -z "$curpass" ] && break - totalsize=$(expr $totalsize + $(cat "${PWD}/livecd.${PROJECT}.${curpass}.size")) + totalsize=$(expr $totalsize + $(cat "${PWD}/livecd.${PROJECT_FULL}.${curpass}.size")) done echo ${totalsize} > "${prefix}.size" @@ -141,7 +144,7 @@ build_layered_squashfs () { if [ -f config/$pass.catalog-in.yaml ]; then echo "Expanding catalog entry template for $pass" - usc_opts="--output livecd.${PROJECT}.install-sources.yaml \ + usc_opts="--output livecd.${PROJECT_FULL}.install-sources.yaml \ --template config/$pass.catalog-in.yaml \ --size $(du -B 1 -s chroot/ | cut -f1) --squashfs ${pass}.squashfs \ --translations config/catalog-translations" @@ -168,9 +171,9 @@ do done # Ubiquity-compatible removal manifest for ISO not using a layered-aware installer -if [ -n "$(ls livecd.${PROJECT}.*install.live.manifest.full 2>/dev/null)" ] && \ - [ -n "$(ls livecd.${PROJECT}.*install.manifest.full 2>/dev/null)" ]; then - echo "$(diff livecd.${PROJECT}.*install.live.manifest.full livecd.${PROJECT}.*install.manifest.full | awk '/^< / { print $2 }')" > livecd.${PROJECT}-manifest-remove +if [ -n "$(ls livecd.${PROJECT_FULL}.*install.live.manifest.full 2>/dev/null)" ] && \ + [ -n "$(ls livecd.${PROJECT_FULL}.*install.manifest.full 2>/dev/null)" ]; then + echo "$(diff livecd.${PROJECT_FULL}.*install.live.manifest.full livecd.${PROJECT_FULL}.*install.manifest.full | awk '/^< / { print $2 }')" > livecd.${PROJECT_FULL}-manifest-remove fi chmod 644 *.squashfs *.manifest* *.size diff --git a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early index ec02cc3c..a6a19f86 100755 --- a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early +++ b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early @@ -11,6 +11,8 @@ case $PASS in kernel_metapkg=linux-generic elif [ "$flavor" = "generic-hwe" ]; then kernel_metapkg=linux-generic-hwe-$(lsb_release -sr) + elif [ "$flavor" = "intel-iotg" ]; then + kernel_metapkg=linux-intel-iotg else echo "bogus flavor: $flavor" exit 1 diff --git a/live-build/ubuntu-server/hooks/04-kernel-bits.binary b/live-build/ubuntu-server/hooks/04-kernel-bits.binary index a5d64a12..551c7a42 100755 --- a/live-build/ubuntu-server/hooks/04-kernel-bits.binary +++ b/live-build/ubuntu-server/hooks/04-kernel-bits.binary @@ -13,6 +13,8 @@ case $PASS in ;; esac +PROJECT=$PROJECT${SUBARCH:+-$SUBARCH} + # Fish out generated kernel image and initrd mv chroot/boot/initrd.img-* ${PWD}/livecd.${PROJECT}.initrd-$flavor mv chroot/boot/vmlinu?-* ${PWD}/livecd.${PROJECT}.kernel-$flavor From 19ef20f0bbdb4b7a1decbb2b8e4ab19b7a6cba09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Fri, 17 Mar 2023 12:35:49 +0100 Subject: [PATCH 62/88] Fix typo. --- live-build/auto/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/auto/config b/live-build/auto/config index 4f7cf9b9..1f812180 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -897,7 +897,7 @@ case $PROJECT in # the GA and HWE kernels (in separate layers) so this code is # written generically to support both even though a lot of the # time only one kernel is offered. - case ${SUBARCH-} in + case ${SUBARCH:-} in intel-iot) variants='intel' ;; From a6d7181cc1c887b3240a1eb92096b67cbf4298b9 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 18 Mar 2023 08:25:01 -0700 Subject: [PATCH 63/88] No new dependencies on i386 (xorriso). --- debian/changelog | 4 ++++ debian/control | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ffa66066..e7647046 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,15 @@ livecd-rootfs (2.813) UNRELEASED; urgency=medium + [ Łukasz 'sil2100' Zemczak ] * Make sure that for devel we also use the right intel-iot kernel flavor for the images. We don't build any for this series, but it's good to have parity in the devel branch. * Add support for building intel-iot server images. Not used in lunar, but adding to keep devel up-to-date with changes. + [ Steve Langasek ] + * No new dependencies on i386 (xorriso). + -- Łukasz 'sil2100' Zemczak Fri, 17 Mar 2023 11:53:09 +0100 livecd-rootfs (2.812) lunar; urgency=medium diff --git a/debian/control b/debian/control index ee6ed31a..e784364a 100644 --- a/debian/control +++ b/debian/control @@ -40,7 +40,7 @@ Depends: ${misc:Depends}, u-boot-tools [armhf arm64], ubuntu-image [!i386 !riscv64], python3-vmdkstream [amd64 i386], - xorriso, + xorriso [!i386], xz-utils, zerofree Breaks: ubuntu-defaults-builder (<< 0.32) From 857fcbeca4c5df70d9cf95481b2f675a80ff8f7d Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 18 Mar 2023 08:25:07 -0700 Subject: [PATCH 64/88] releasing package livecd-rootfs version 2.813 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e7647046..da5fcb8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.813) UNRELEASED; urgency=medium +livecd-rootfs (2.813) lunar; urgency=medium [ Łukasz 'sil2100' Zemczak ] * Make sure that for devel we also use the right intel-iot kernel flavor @@ -10,7 +10,7 @@ livecd-rootfs (2.813) UNRELEASED; urgency=medium [ Steve Langasek ] * No new dependencies on i386 (xorriso). - -- Łukasz 'sil2100' Zemczak Fri, 17 Mar 2023 11:53:09 +0100 + -- Steve Langasek Sat, 18 Mar 2023 08:25:03 -0700 livecd-rootfs (2.812) lunar; urgency=medium From b1db77eaa257fe7a2d86ac7dd49294df2fc8886c Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Fri, 17 Mar 2023 14:38:25 -0600 Subject: [PATCH 65/88] no-compact systemd conf: journal backwards compat --- .../systemd/system/systemd-journald.service.d/no-compact.conf | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/system/systemd-journald.service.d/no-compact.conf diff --git a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/system/systemd-journald.service.d/no-compact.conf b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/system/systemd-journald.service.d/no-compact.conf new file mode 100644 index 00000000..a0701e52 --- /dev/null +++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/system/systemd-journald.service.d/no-compact.conf @@ -0,0 +1,4 @@ +# systemd in 23.04+ uses a newer "compact" format by default which is not +# understood by the systemd libraries from jammy used in the subiquity snap. +[Service] +Environment="SYSTEMD_JOURNAL_COMPACT=0" From 2cec50433478632da96f8e31d5d13d0a837a2bbc Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Fri, 17 Mar 2023 14:48:33 -0600 Subject: [PATCH 66/88] zstd is ok for reading the journal from core22 --- .../etc/systemd/journald.conf.d/no-zstd.conf | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/journald.conf.d/no-zstd.conf diff --git a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/journald.conf.d/no-zstd.conf b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/journald.conf.d/no-zstd.conf deleted file mode 100644 index 060bf85b..00000000 --- a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/journald.conf.d/no-zstd.conf +++ /dev/null @@ -1,4 +0,0 @@ -# systemd in 22.04+ uses zstd compression by default, which is not understood -# by the systemd libraries from focal used in the subiquity snap. -[Journal] -Compress=false From 41acfaa9112110066d4af1b971fc835188c3551b Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Mon, 20 Mar 2023 15:01:58 -0600 Subject: [PATCH 67/88] changelog --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index da5fcb8b..1fce58fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.814) lunar; urgency=medium + + * Adjust journald settings for live-server for compatibility with Subiquity. + With a move to core22 we can turn zstd back on, but the new compact flag + needs to be off. (LP: #2006985) + + -- Dan Bungert Mon, 20 Mar 2023 15:00:52 -0600 + livecd-rootfs (2.813) lunar; urgency=medium [ Łukasz 'sil2100' Zemczak ] From 20bb504bb355a4dc53d754006643533e293b6f63 Mon Sep 17 00:00:00 2001 From: John Chittum Date: Tue, 21 Mar 2023 14:03:24 -0500 Subject: [PATCH 68/88] Revert "fix: remove ipc from apparmor features in 6.1" This reverts commit 075e7a0eb4d59625f265f05dc44ceb7d9f52fdb4. --- live-build/apparmor/generic/ipc/posix_mqueue | 1 + 1 file changed, 1 insertion(+) create mode 100644 live-build/apparmor/generic/ipc/posix_mqueue diff --git a/live-build/apparmor/generic/ipc/posix_mqueue b/live-build/apparmor/generic/ipc/posix_mqueue new file mode 100644 index 00000000..c20f9f93 --- /dev/null +++ b/live-build/apparmor/generic/ipc/posix_mqueue @@ -0,0 +1 @@ +create read write open delete setattr getattr From 0be258fa8db0184aecd41ec3f3a956fef72e0824 Mon Sep 17 00:00:00 2001 From: John Chittum Date: Tue, 21 Mar 2023 14:06:28 -0500 Subject: [PATCH 69/88] open 2.815 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1fce58fd..c95a6f00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.815) UNRELEASED; urgency=medium + + * revert ipc change. kernel 6.2 will have the correct setting + + -- jchittum Tue, 21 Mar 2023 14:05:16 -0500 + livecd-rootfs (2.814) lunar; urgency=medium * Adjust journald settings for live-server for compatibility with Subiquity. From 279b9473d8276fc0490267b328af770e020d4d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Thu, 23 Mar 2023 10:57:26 +0100 Subject: [PATCH 70/88] Add zstd dep for mini-iso + minor fixes to get it building on livefs builders. --- debian/changelog | 13 +++++++++++++ debian/control | 3 ++- live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary | 8 +++++--- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1fce58fd..47d862f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +livecd-rootfs (2.815) UNRELEASED; urgency=medium + + [ Dan Bungert ] + * debian/control: depend on zstd to test unmkinitramfs failure. + + [ Łukasz 'sil2100' Zemczak ] + * Change the mini-iso livefs artifact name from .mini-iso.iso to .iso to be + more compatible with existing cdimage machinery. + * Rename variables accessed in the mini-iso to the equivalents exported to + binary hooks. + + -- Łukasz 'sil2100' Zemczak Thu, 23 Mar 2023 10:43:29 +0100 + livecd-rootfs (2.814) lunar; urgency=medium * Adjust journald settings for live-server for compatibility with Subiquity. diff --git a/debian/control b/debian/control index e784364a..438239e0 100644 --- a/debian/control +++ b/debian/control @@ -42,7 +42,8 @@ Depends: ${misc:Depends}, python3-vmdkstream [amd64 i386], xorriso [!i386], xz-utils, - zerofree + zerofree, + zstd Breaks: ubuntu-defaults-builder (<< 0.32) Description: construction script for the livecd rootfs livecd-rootfs provides the script used to create the root filesystem diff --git a/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary b/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary index 6e857f9c..b5d4b082 100755 --- a/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary +++ b/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary @@ -10,6 +10,8 @@ case $ARCH in ;; esac +. config/binary + KERNEL=chroot/boot/vmlinuz INITRD=chroot/boot/initrd.img @@ -60,14 +62,14 @@ cat > ubuntu-mini-iso/$ARCH/tree/.disk/cd_type < ubuntu-mini-iso/$ARCH/tree/.disk/info < Date: Thu, 23 Mar 2023 11:08:55 +0100 Subject: [PATCH 71/88] Adjust changelog. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 47d862f4..c40cf232 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ livecd-rootfs (2.815) UNRELEASED; urgency=medium [ Dan Bungert ] - * debian/control: depend on zstd to test unmkinitramfs failure. + * debian/control: depend on zstd to fix unmkinitramfs failure. [ Łukasz 'sil2100' Zemczak ] * Change the mini-iso livefs artifact name from .mini-iso.iso to .iso to be From e1d6746467420cb27b330010caca8cd4c9838143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Thu, 23 Mar 2023 11:09:08 +0100 Subject: [PATCH 72/88] releasing package livecd-rootfs version 2.815 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c40cf232..b6a0116a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.815) UNRELEASED; urgency=medium +livecd-rootfs (2.815) lunar; urgency=medium [ Dan Bungert ] * debian/control: depend on zstd to fix unmkinitramfs failure. From fba5be17fdecb03cd6c8efb56bdb9f905702fb67 Mon Sep 17 00:00:00 2001 From: Chad Smith Date: Thu, 23 Mar 2023 17:05:30 -0600 Subject: [PATCH 73/88] cloud-init.service: systemd ordering after after NetworkManager Autoinstall directives can be provided on the grub cmdline to cloud-init via kernel parameters like the following: autoinstall 'ds=nocloud-net;s=http://somedomain/' In order to support DNS resolution for NoCloud datasource at datasource discovery time, cloud-init.service needs to be orderered after NetworkManager.service and NetworkManager-wait-online.service which will have brought up applicable NICs. Since NetworkManager is After=dbus.service, the cloud-init.service avoids systemd ordering cycles by also dropping Before=sysinit.target when it adds, After=NetworkManager.service and After=NetworkManager-wait-online.service Add this file overlay for /lib/systemd/system/cloud-init.service because systemd drop-in files can only add constraints and not drop prexisting service constraints. Also add an AUTOMATION_HEADER comment to any generated files to add discoverability in the event of future bugs/concerns. LP: #2008952 --- live-build/functions | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/live-build/functions b/live-build/functions index e1f00005..1e81de9b 100644 --- a/live-build/functions +++ b/live-build/functions @@ -4,6 +4,8 @@ imagesize=${IMAGE_SIZE:-2361393152} fs_label="${FS_LABEL:-rootfs}" +AUTOMATION_HEADER="# Automatically generated by installer build process" + rootfs_dev_mapper= loop_device= loop_raw= @@ -1010,6 +1012,7 @@ EOF # inform cloud-init of the same (LP: #1982855) mkdir -p chroot/etc/cloud/cloud.cfg.d cat < chroot/etc/cloud/cloud.cfg.d/99-installer-use-networkmanager.cfg +${AUTOMATION_HEADER} # Let NetworkManager manage all devices on this system system_info: network: @@ -1017,6 +1020,50 @@ system_info: activators: ['network-manager'] EOF + # Position cloud-init.service After=NetworkManager.service. + # (LP: #2008952). + # We override the entire cloud-init.service definition because + # systemd drop-in files only allow adding Before/After constraints + # yet we are dropping the Before=sysinit.target from the upstream + # cloud-init.service. + # This override can be dropped when NetworkManager.service can run + # Before=sysinit.target when it drops strict dbus.service dependency. + cat < chroot/lib/systemd/system/cloud-init.service +${AUTOMATION_HEADER} +# Based on cloud-init 23.1 for Desktop LiveCD +[Unit] +Description=Initial cloud-init job (metadata service crawler) +DefaultDependencies=no +Wants=cloud-init-local.service +Wants=sshd-keygen.service +Wants=sshd.service +After=cloud-init-local.service +After=systemd-networkd-wait-online.service +# Installer Added After=NetworkManager* ordering +After=NetworkManager.service +After=NetworkManager-wait-online.service +After=networking.service +Before=network-online.target +Before=sshd-keygen.service +Before=sshd.service +# Before=sysinit.target Installer removed to allow for NM dependency +Before=shutdown.target +Conflicts=shutdown.target +Before=systemd-user-sessions.service + +[Service] +Type=oneshot +ExecStart=/usr/bin/cloud-init init +RemainAfterExit=yes +TimeoutSec=0 + +# Output needs to appear in instance console output +StandardOutput=journal+console + +[Install] +WantedBy=cloud-init.target +EOF + # Allow cloud-init clean to inform of strict network-manager config mkdir -p chroot/etc/cloud/clean.d cat < chroot/etc/cloud/clean.d/99-installer-use-networkmanager From 140385c10cd14aba2419e246744ec059e5bda1e7 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Fri, 24 Mar 2023 18:39:17 -0600 Subject: [PATCH 74/88] Update changelog --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index b6a0116a..12c47d12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.816) lunar; urgency=medium + + [ Chad Smith ] + * Replace cloud-init.service on NetworkManager images to address an ordering + cycle interfering with autoinstall with ubuntu-desktop-installer. + (LP: #2008952) + + -- Dan Bungert Fri, 24 Mar 2023 18:35:46 -0600 + livecd-rootfs (2.815) lunar; urgency=medium [ Dan Bungert ] From 6d1b422a3f2b00bfc7d8aa0492b6490346c800bb Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 27 Mar 2023 12:11:21 -0700 Subject: [PATCH 75/88] releasing package livecd-rootfs version 2.817 --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4013b8a4..84236db8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -livecd-rootfs (2.817) UNRELEASED; urgency=medium +livecd-rootfs (2.817) lunar; urgency=medium + [ John Chittum ] * revert ipc change. kernel 6.2 will have the correct setting - -- jchittum Tue, 21 Mar 2023 14:05:16 -0500 + -- Steve Langasek Mon, 27 Mar 2023 12:11:06 -0700 livecd-rootfs (2.816) lunar; urgency=medium From a312ab11a749eab6afdb013649e777a735683503 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Tue, 31 Jan 2023 22:05:19 +0000 Subject: [PATCH 76/88] Remove the mkswap and swapfile units These will be provided by the ubuntu-raspi-settings-desktop in future --- .../099-ubuntu-image-customization.chroot | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot b/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot index 6dd49d8f..6e54e2c2 100644 --- a/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot +++ b/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot @@ -51,35 +51,5 @@ if [ "$IMAGEFORMAT" == "none" ]; then } ' /etc/fstab > /etc/fstab.new mv /etc/fstab.new /etc/fstab - - # Add units for a 1GiB swapfile, generated on first boot - cat << EOF > /lib/systemd/system/mkswap.service -[Unit] -Description=Create the default swapfile -DefaultDependencies=no -Requires=local-fs.target -After=local-fs.target -Before=swapfile.swap -ConditionPathExists=!/swapfile - -[Service] -Type=oneshot -ExecStartPre=fallocate -l 1GiB /swapfile -ExecStartPre=chmod 600 /swapfile -ExecStart=mkswap /swapfile - -[Install] -WantedBy=swap.target -EOF - cat << EOF > /lib/systemd/system/swapfile.swap -[Unit] -Description=The default swapfile - -[Swap] -What=/swapfile -EOF - mkdir -p /lib/systemd/system/swap.target.wants - ln -s ../mkswap.service /lib/systemd/system/swap.target.wants/ - ln -s ../swapfile.swap /lib/systemd/system/swap.target.wants/ fi fi From da4481d013bf90025b54f3befd7502c8f636954a Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Tue, 31 Jan 2023 22:09:54 +0000 Subject: [PATCH 77/88] changelog --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 84236db8..2c36d024 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.818) UNRELEASED; urgency=medium + + * raspi: drop mkswap.service and swapfile.swap units in + 099-ubuntu-image-customization.chroot in favour of units provided by + ubuntu-raspi-settings-desktop + + -- Dave Jones Tue, 28 Mar 2023 14:38:55 +0100 + livecd-rootfs (2.817) lunar; urgency=medium [ John Chittum ] From 6a804b7b2cb5ea6113cf92e185b7c9a55fc23d96 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Tue, 28 Mar 2023 14:51:13 +0100 Subject: [PATCH 78/88] Don't add 01-network-manager-all.yaml to preinstalled desktop images --- live-build/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/functions b/live-build/functions index 1e81de9b..a3cbadfd 100644 --- a/live-build/functions +++ b/live-build/functions @@ -999,7 +999,7 @@ configure_network_manager() { # default. Installing NM on an existing system only manages wifi and wwan via # /usr/lib/NetworkManager/conf.d/10-globally-managed-devices.conf. When setting # the global backend to NM, netplan overrides that file. - if [ -e chroot/usr/sbin/NetworkManager -a ! -f chroot/etc/netplan/01-network-manager-all.yaml ]; then + if [ -e chroot/usr/sbin/NetworkManager -a ! -f chroot/etc/netplan/01-network-manager-all.yaml -a "$SUBPROJECT" != "desktop-preinstalled" ]; then echo "===== Enabling all devices in NetworkManager ====" mkdir -p chroot/etc/netplan cat < chroot/etc/netplan/01-network-manager-all.yaml From 021960a5ab7bc22273e090f5c164f2a86a87d2cf Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Tue, 28 Mar 2023 14:52:10 +0100 Subject: [PATCH 79/88] changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2c36d024..412bac3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ livecd-rootfs (2.818) UNRELEASED; urgency=medium * raspi: drop mkswap.service and swapfile.swap units in 099-ubuntu-image-customization.chroot in favour of units provided by ubuntu-raspi-settings-desktop + * raspi: drop 01-network-manager-all.yaml in favour of configuration + provided by ubuntu-raspi-settings-desktop -- Dave Jones Tue, 28 Mar 2023 14:38:55 +0100 From 1f497fe04f2b8fdf5596d7b9d209a82818871458 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Tue, 28 Mar 2023 16:00:38 +0100 Subject: [PATCH 80/88] Get rid of growfs option in fstab --- .../ubuntu/hooks/099-ubuntu-image-customization.chroot | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot b/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot index 6e54e2c2..5fa3f713 100644 --- a/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot +++ b/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot @@ -17,12 +17,10 @@ if [ "$IMAGEFORMAT" == "none" ]; then /usr/sbin/oem-config-prepare --quiet touch "/var/lib/oem-config/run" - # Update the fstab to include the "discard" option, and - # "x-systemd.growfs" to ensure the root partition is expanded on first - # boot + # Update the fstab to include the "discard" option awk \ -v root_fs_label="writable" \ - -v root_fs_options="discard,x-systemd.growfs" \ + -v root_fs_options="discard" \ ' BEGIN { OFS="\t"; count=0; } From b3641074f1ee5e208a1ca4089f94d80f4f1f9471 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Tue, 28 Mar 2023 16:01:16 +0100 Subject: [PATCH 81/88] changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 412bac3d..aa6055e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ livecd-rootfs (2.818) UNRELEASED; urgency=medium ubuntu-raspi-settings-desktop * raspi: drop 01-network-manager-all.yaml in favour of configuration provided by ubuntu-raspi-settings-desktop + * raspi: drop growfs option from fstab in favour of growroot-almost + service provided by ubuntu-raspi-settings-desktop -- Dave Jones Tue, 28 Mar 2023 14:38:55 +0100 From a52543341c6250e4dd7ba57ac6a03397c184209f Mon Sep 17 00:00:00 2001 From: William Wilson Date: Thu, 30 Mar 2023 09:14:46 -0400 Subject: [PATCH 82/88] Only set up oem-config if the user doesn't already exist --- debian/changelog | 4 ++++ .../ubuntu/hooks/099-ubuntu-image-customization.chroot | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index aa6055e6..61e683d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ livecd-rootfs (2.818) UNRELEASED; urgency=medium + [ Dave Jones ] * raspi: drop mkswap.service and swapfile.swap units in 099-ubuntu-image-customization.chroot in favour of units provided by ubuntu-raspi-settings-desktop @@ -8,6 +9,9 @@ livecd-rootfs (2.818) UNRELEASED; urgency=medium * raspi: drop growfs option from fstab in favour of growroot-almost service provided by ubuntu-raspi-settings-desktop + [ William 'jawn-smith' Wilson ] + * Skip oem-config setup in hooks if the oem user already exists. + -- Dave Jones Tue, 28 Mar 2023 14:38:55 +0100 livecd-rootfs (2.817) lunar; urgency=medium diff --git a/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot b/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot index 5fa3f713..91449b61 100644 --- a/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot +++ b/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot @@ -11,7 +11,13 @@ if [ "$IMAGEFORMAT" == "none" ]; then touch /var/log/syslog chown syslog:adm /var/log/syslog - # Create the oem user account + # Create the oem user account only if it doesn't already exist + if ! id "oem" &>/dev/null; then + /usr/sbin/useradd -d /home/oem -G adm,sudo -m -N -u 29999 oem + /usr/sbin/oem-config-prepare --quiet + touch "/var/lib/oem-config/run" + fi + /usr/sbin/useradd -d /home/oem -G adm,sudo -m -N -u 29999 oem /usr/sbin/oem-config-prepare --quiet From e1090424bb69fdc16d0173eb1127ee529fabdf35 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 3 Apr 2023 08:49:26 -0700 Subject: [PATCH 83/88] Update URL to point to ubuntu-archive-team.ubuntu.com. --- debian/changelog | 3 +++ live-build/auto/config | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 61e683d1..ba019c77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ livecd-rootfs (2.818) UNRELEASED; urgency=medium [ William 'jawn-smith' Wilson ] * Skip oem-config setup in hooks if the oem user already exists. + [ Steve Langasek ] + * Update URL to point to ubuntu-archive-team.ubuntu.com. + -- Dave Jones Tue, 28 Mar 2023 14:38:55 +0100 livecd-rootfs (2.817) lunar; urgency=medium diff --git a/live-build/auto/config b/live-build/auto/config index 1f812180..628f4d16 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -12,7 +12,7 @@ fi echo "Building on $(hostname --fqdn)" -SEEDMIRROR=http://people.canonical.com/~ubuntu-archive/seeds/ +SEEDMIRROR=https://ubuntu-archive-team.ubuntu.com/seeds/ if [ -z "$MIRROR" ]; then case $(hostname --fqdn) in *.ubuntu.com) MIRROR=http://ftpmaster.internal/ubuntu/ From d42c7c5989644dff7e431bc3d966207210c733aa Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Thu, 23 Feb 2023 09:52:37 +0100 Subject: [PATCH 84/88] Add image for StarFive VisionFive 2 SUBARCH=visionfive2 is used to build images for the StarFive VisionFive 2 boards. For the device-tree we assume board revision 1.3B. Signed-off-by: Heinrich Schuchardt --- live-build/auto/config | 9 +++- .../hooks.d/base/disk-image-uefi.binary | 47 ++++++++++++++++++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index 628f4d16..db1da0d8 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -352,7 +352,14 @@ fi # one also must request disk1-img-xz image format if [ "$IMAGEFORMAT" = "ext4" ] && [ "$PROJECT" = "ubuntu-cpc" ]; then case $ARCH:$SUBARCH in - armhf:raspi2|riscv64:sifive_*|riscv64:nezha|riscv64:visionfive|riscv64:licheerv|riscv64:icicle|*:generic) + armhf:raspi2 | \ + riscv64:icicle | \ + riscv64:nezha | \ + riscv64:licheerv | \ + riscv64:sifive_* | \ + riscv64:visionfive | \ + riscv64:visionfive2 | \ + *:generic) IMAGE_HAS_HARDCODED_PASSWORD=1 if [ -z "${IMAGE_TARGETS:-}" ]; then export IMAGE_TARGETS="disk1-img-xz" diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index bbe271ad..c77305a2 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -128,6 +128,23 @@ create_partitions() { --change-name=3:uEnv \ --new=1:: \ --attributes=1:set:2 + elif [ "${SUBARCH:-}" = "visionfive2" ]; then + # VisionFive 2 + sgdisk "${disk_image}" \ + --set-alignment=4096 \ + --new=13:4096:8191 \ + --typecode=13:2E54B353-1271-4842-806F-E436D6AF6985 \ + --change-name=13:loader1 \ + --new=2:8192:16383 \ + --typecode=2:7a097280-70d2-44bc-886c-ff5ffbb7b098 \ + --change-name=2:loader2 \ + --new=12:16384:24575 \ + --change-name=12:CIDATA \ + --new=15:24576:229375 \ + --typecode=15:ef00 \ + --change-name=15:ESP \ + --new=1:229376: \ + --attributes=1:set:2 else # preinstalled server, currently FU540 # FU740 too in the future @@ -373,8 +390,32 @@ EOF # without a cloud datasource. setup_cinocloud mountpoint ;; + "visionfive2") + echo "Installing GRUB for ${SUBARCH} board" + cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/ + # flash-kernel is needed to install the dtb for update-grub: it uses the + # /proc/device-tree/model value to pick the correct dtb and as we are in a chroot, + # the model value is wrong and we need to use /etc/flash-kernel/machine instead. + # This explains why we install flash-kernel here. + chroot mountpoint mkdir -p /etc/flash-kernel/ + chroot mountpoint bash -c "echo 'StarFive VisionFive 2 v1.3B' > /etc/flash-kernel/machine" + chroot mountpoint bash -c 'FK_FORCE=yes apt-get install -qqy grub-efi-riscv64 flash-kernel' + efi_target=riscv64-efi + # Provide end-user modifyable CIDATA + cidata_dev="/dev/mapper${loop_device///dev/}p12" + setup_cidata "${cidata_dev}" + # Provide stock nocloud datasource + # Allow interactive login on baremetal board, + # without a cloud datasource. + setup_cinocloud mountpoint + # Flash-kernel creates boot.scr if it believes we did + # not boot in UEFi mode. Remove it so that we can boot + # via GRUB. + chroot mountpoint rm -f /boot/boot.scr + ;; *) cp ${my_d}/riscv64/grub/90_watchdog-thresh.cfg mountpoint/etc/default/grub.d/ + echo "Installing u-boot-menu for ${SUBARCH} board" chroot mountpoint apt-get install -qqy u-boot-menu #grub-efi-riscv64 mkdir -p mountpoint/etc/u-boot-menu/conf.d/ cp ${my_d}/riscv64/u-boot-menu/*.conf mountpoint/etc/u-boot-menu/conf.d/ @@ -408,7 +449,11 @@ EOF chroot mountpoint u-boot-update fi - if [ "${SUBARCH:-}" != "visionfive" ] && [ "${SUBARCH:-}" != "nezha" ] && [ "${SUBARCH:-}" != "licheerv" ] && [ "${SUBARCH:-}" != "icicle" ]; then + if [ "${SUBARCH:-}" != "nezha" ] && \ + [ "${SUBARCH:-}" != "licheerv" ] && \ + [ "${SUBARCH:-}" != "icicle" ] \ + [ "${SUBARCH:-}" != "visionfive" ] && \ + [ "${SUBARCH:-}" != "visionfive2" ]; then ## TODO remove below once we have grub-efi-riscv64 for the platforms rm mountpoint/tmp/device.map umount mountpoint/boot/efi From b713f7c622993e3258808e9d63259e19a67c43bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Wed, 5 Apr 2023 17:23:17 +0200 Subject: [PATCH 85/88] Add changelog entry. --- debian/changelog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ba019c77..a4256660 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,10 @@ livecd-rootfs (2.818) UNRELEASED; urgency=medium [ Steve Langasek ] * Update URL to point to ubuntu-archive-team.ubuntu.com. - -- Dave Jones Tue, 28 Mar 2023 14:38:55 +0100 + [ Heinrich Schuchardt ] + * Add image for StarFive VisionFive 2. + + -- Łukasz 'sil2100' Zemczak Wed, 05 Apr 2023 17:21:21 +0200 livecd-rootfs (2.817) lunar; urgency=medium From 8824af2ad854d71568e3060d373b8c386f73ab45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Wed, 5 Apr 2023 17:37:10 +0200 Subject: [PATCH 86/88] releasing package livecd-rootfs version 2.818 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a4256660..01cbf9ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.818) UNRELEASED; urgency=medium +livecd-rootfs (2.818) lunar; urgency=medium [ Dave Jones ] * raspi: drop mkswap.service and swapfile.swap units in From 6ba7d53be56a16e492549c419995dafb4df5511c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Wed, 5 Apr 2023 20:15:10 +0200 Subject: [PATCH 87/88] Sync the uncommitted direct upload to lunar. --- debian/changelog | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 01cbf9ea..5ccb188c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +livecd-rootfs (2.819) UNRELEASED; urgency=medium + + [ Heinrich Schuchardt ] + * Add image for StarFive VisionFive 2. + + [ Steve Langasek ] + * Update URL to point to ubuntu-archive-team.ubuntu.com. + + -- Łukasz 'sil2100' Zemczak Wed, 05 Apr 2023 18:01:07 +0200 + livecd-rootfs (2.818) lunar; urgency=medium [ Dave Jones ] @@ -12,13 +22,7 @@ livecd-rootfs (2.818) lunar; urgency=medium [ William 'jawn-smith' Wilson ] * Skip oem-config setup in hooks if the oem user already exists. - [ Steve Langasek ] - * Update URL to point to ubuntu-archive-team.ubuntu.com. - - [ Heinrich Schuchardt ] - * Add image for StarFive VisionFive 2. - - -- Łukasz 'sil2100' Zemczak Wed, 05 Apr 2023 17:21:21 +0200 + -- Dave Jones Tue, 28 Mar 2023 14:38:55 +0100 livecd-rootfs (2.817) lunar; urgency=medium From 3e2b71fafaf426b1d077e1fdf2e9c4caf05edcd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Wed, 5 Apr 2023 20:15:27 +0200 Subject: [PATCH 88/88] releasing package livecd-rootfs version 2.819 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5ccb188c..ef831f37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.819) UNRELEASED; urgency=medium +livecd-rootfs (2.819) lunar; urgency=medium [ Heinrich Schuchardt ] * Add image for StarFive VisionFive 2.