Imported 2.804

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,45 @@
+livecd-rootfs (2.804) lunar; urgency=medium
+
+  * Clarified with Erich that edubuntu should install ubuntu-desktop-minimal
+    task.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 24 Feb 2023 21:11:56 -0800
+
+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 <steve.langasek@ubuntu.com>  Fri, 24 Feb 2023 21:05:48 -0800
+
+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
+    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 <steve.langasek@ubuntu.com>  Fri, 24 Feb 2023 17:47:54 -0800
+
+livecd-rootfs (2.801) lunar; 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 ]
+  * 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).
+  * Cherry-pick jammy point release fixes.
+
+ -- Dimitri John Ledkov <dimitri.ledkov@canonical.com>  Fri, 24 Feb 2023 12:20:04 +0000
+
 livecd-rootfs (2.800) lunar; urgency=medium
 
   * WSL: do not depend on standard anymore.

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

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
@@ -482,6 +492,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

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)
@@ -776,14 +776,19 @@ case $PROJECT in
 		;;
 
 	edubuntu)
-		add_task install minimal standard ubuntu-minimal edubuntu-desktop-gnome
+		add_task install minimal standard ubuntu-desktop-minimal edubuntu-desktop-gnome
 		LIVE_TASK='edubuntu-live'
 		;;
 
+	ubuntucinnamon)
+		add_task install minimal standard ubuntucinnamon-desktop
+		LIVE_TASK='ubuntucinnamon-live'
+		;;
+
 	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

live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary

@@ -243,10 +243,11 @@ 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"
+                        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,7 +368,10 @@ 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
+                        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}"

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"

live-build/ubuntu-cpc/hooks.d/base/riscv64/u-boot-menu/10_cmdline.conf

@@ -0,0 +1 @@
+U_BOOT_PARAMETERS="ro efi=debug earlycon"

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"

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

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