Imported 2.751

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,75 @@
+livecd-rootfs (2.751) jammy; urgency=medium
+
+  * Revert patch for unmounting in local builds as it is causing autopkgtest
+    regressions
+
+ -- William 'jawn-smith' Wilson <jawn-smith@ubuntu.com>  Wed, 12 Jan 2022 13:43:24 -0600
+
+livecd-rootfs (2.750) jammy; urgency=medium
+
+  * Do not look for a base snap on snaps of type base, because recursive
+    dependencies are not allowed for snaps.  LP: #1957123.
+  * Treat it as a fatal error if we are asked to install a snap that would
+    pull in the core snap.  Ubuntu 20.04 and Ubuntu 22.04 official images
+    should never require snaps that depend on an Ubuntu 16.04 runtime, this
+    indicates a misconfiguration that will bloat the install.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 11 Jan 2022 17:34:37 -0800
+
+livecd-rootfs (2.749) jammy; urgency=medium
+
+  [ Heinrich Schuchardt ]
+  * riscv64: ensure reasonable partition alignment (LP: #1952916).
+  * functions: fix unmounting for local builds (LP: #1952921).
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Thu, 16 Dec 2021 12:40:16 +0100
+
+livecd-rootfs (2.748) jammy; urgency=medium
+
+  * live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl: do not
+    automatically allocate serial0 as it causes a hang when upgrading.
+    (LP: #1895104)
+
+ -- Brian Murray <brian@ubuntu.com>  Wed, 15 Dec 2021 10:09:44 -0800
+
+livecd-rootfs (2.747) jammy; urgency=medium
+
+  * ubuntu-cpc/hooks.d/base/disk-image-uefi.binary: Bump UEFI disk image
+    size for armhf to 3.5 GB.
+    Current builds are failing because the disk size is not big enough.
+
+ -- Thomas Bechtold <thomas.bechtold@canonical.com>  Tue, 23 Nov 2021 10:15:18 +0100
+
+livecd-rootfs (2.746) jammy; urgency=medium
+
+  * Add the capability to build an ISO image for the Intel IoT project.
+    Additionally, stop using universe with the project given that the kernel
+    is now in main.
+
+ -- Brian Murray <brian@ubuntu.com>  Tue, 16 Nov 2021 17:00:57 -0800
+
+livecd-rootfs (2.745) jammy; urgency=medium
+
+  [ Erich Eickmeyer ]
+  * Remove fonts and publishing tasks from ubuntustudio DVD
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 08 Nov 2021 13:43:53 -0800
+
+livecd-rootfs (2.744) jammy; urgency=medium
+
+  * Install desired already seeded snap in wsl.
+    As wsl is an image target of ubuntu-cpc, the base seed is hardcoded to
+    ubuntu-server instead of wsl one. For now, add it, as for the other
+    cpc images, in hooks.
+
+ -- Didier Roche <didrocks@ubuntu.com>  Fri, 05 Nov 2021 10:23:24 +0100
+
+livecd-rootfs (2.743) jammy; urgency=medium
+
+  * magic-proxy: fix exception handling for URLError. LP: #1946520
+
+ -- Thomas Bechtold <thomas.bechtold@canonical.com>  Mon, 25 Oct 2021 12:22:16 +0200
+
 livecd-rootfs (2.742) impish; urgency=medium
 
   [ Brian Murray ]

live-build/auto/build

@@ -576,6 +576,9 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
 		oem-*)
 			FLAVOUR="oem"
 			;;
+		image-intel)
+			FLAVOUR="intel"
+			;;
 	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

live-build/auto/config

@@ -707,7 +707,7 @@ case $PROJECT in
 						;;
 					intel-iot)
 						KERNEL_FLAVOURS='image-intel'
-						COMPONENTS='main restricted universe'
+						COMPONENTS='main restricted'
 						OPTS="${OPTS:+$OPTS }--initramfs=none"
 						OPTS="${OPTS:+$OPTS }--system=normal"
 						OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
@@ -724,6 +724,10 @@ case $PROJECT in
 				add_task install minimal standard ubuntu-desktop
 				add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages
 				KERNEL_FLAVOURS='generic-hwe-20.04'
+				if [ "$SUBARCH" = "intel-iot" ]; then
+					KERNEL_FLAVOURS='image-intel'
+					COMPONENTS='main restricted'
+				fi
 				;;
 		esac
 		;;
@@ -810,7 +814,7 @@ case $PROJECT in
 		;;
 
 	ubuntustudio-dvd)
-		add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-fonts ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography
+		add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-graphics ubuntustudio-video ubuntustudio-photography
 		COMPONENTS='main restricted universe multiverse'
 		case $ARCH in
 			amd64|i386)	KERNEL_FLAVOURS=lowlatency ;;
@@ -923,7 +927,7 @@ case $PROJECT in
 					KERNEL_FLAVOURS=generic
 				elif [ "${SUBARCH:-}" = "intel-iot" ]; then
 					KERNEL_FLAVOURS=image-intel
-					COMPONENTS='main restricted universe'
+					COMPONENTS='main restricted'
 					OPTS="${OPTS:+$OPTS }--initramfs=none"
 				fi
 				;;
@@ -1082,8 +1086,9 @@ case $PROJECT in
 		KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
 		case $SUBARCH in
 			intel-iot)
-				COMPONENTS='main restricted universe'
+				COMPONENTS='main restricted'
 				KERNEL_FLAVOURS='image-intel'
+				;;
 		esac
 		;;
 esac

live-build/functions

@@ -585,12 +585,20 @@ _snap_preseed() {
                 exit 1
             fi
 
-            local core_snap=$(echo "$snap_info" | grep '^base:' | awk '{print $2}')
+            local snap_type=$(echo "$snap_info" | awk '/^type:/ { print $2 }')
 
-            # If snap info does not list a base use 'core'
-            core_snap=${core_snap:-core}
+            if [ "$snap_type" != base ]; then
+                local core_snap=$(echo "$snap_info" | awk '/^base:/ {print $2}')
 
-            _snap_preseed $CHROOT_ROOT $core_snap stable
+                # If snap info does not list a base the default is 'core'
+                # which is now an error to use.
+                if [ -z "$core_snap" ]; then
+                    echo "Legacy snap with no base declaration found, refusing to install 'core' snap"
+                    exit 1
+                fi
+
+                _snap_preseed $CHROOT_ROOT $core_snap stable
+            fi
             ;;
     esac
 

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

@@ -21,6 +21,10 @@ case ${PROJECT:-} in
         ;;
 esac
 
+if [ "$ARCH" = "armhf" ]; then
+    IMAGE_SIZE=3758096384 # bump to 3.5G (3584*1024**2); Since Jammy armhf need more then the default 2.2G
+fi
+
 # Change image size for preinstalled generic images & all preinstalled riscv64 images
 if [ -n "${SUBARCH:-}" ]; then
     if [ "${SUBARCH:-}" = "generic" ] || [ "$ARCH" = "riscv64" ]; then
@@ -73,7 +77,7 @@ create_partitions() {
                        --new=13:34:2081 \
                        --change-name=13:loader1 \
                        --typecode=13:5B193300-FC78-40CD-8002-E86C45580B47 \
-                       --new=14:2082:10273 \
+                       --new=14:2082:10239 \
                        --change-name=14:loader2 \
                        --typecode=14:2E54B353-1271-4842-806F-E436D6AF6985 \
                        --new=15::+106M \

live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl

@@ -85,7 +85,7 @@
         <rasd:ResourceType>6</rasd:ResourceType>
       </Item>
       <Item ovf:required="false">
-        <rasd:AutomaticAllocation>true</rasd:AutomaticAllocation>
+        <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
         <rasd:ElementName>serial0</rasd:ElementName>
         <rasd:InstanceID>4</rasd:InstanceID>
         <rasd:ResourceSubType>vmware.serialport.device</rasd:ResourceSubType>

live-build/ubuntu-cpc/hooks.d/base/wsl.binary

@@ -37,6 +37,13 @@ setup_mountpoint $rootfs_dir
 env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get -y -qq install ubuntu-wsl
 env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get autoremove --purge --assume-yes
 
+# Install snap manually for now as config on cpc always assume the same base seed for every flavors
+env UBUNTU_STORE_ARCH=${ARCH:-} SNAPPY_STORE_NO_CDN=1 chroot $rootfs_dir snap download --target-directory=/var/lib/snapd/snaps core20
+env UBUNTU_STORE_ARCH=${ARCH:-} SNAPPY_STORE_NO_CDN=1 chroot $rootfs_dir snap download --target-directory=/var/lib/snapd/snaps gtk-common-themes
+env UBUNTU_STORE_ARCH=${ARCH:-} SNAPPY_STORE_NO_CDN=1 chroot $rootfs_dir snap download --target-directory=/var/lib/snapd/snaps --channel=latest/edge ubuntu-desktop-installer
+
+
+
 create_manifest $rootfs_dir livecd.ubuntu-cpc.wsl.rootfs.manifest
 teardown_mountpoint $rootfs_dir
 

magic-proxy

@@ -883,8 +883,10 @@ class ProxyingHTTPRequestHandler(http.server.BaseHTTPRequestHandler):
             self.__send_response(e)
         except urllib.error.URLError as e:
             self.log_message(
-                "urlopen() failed for {} with {}".format(uri, e.reason))
-            self.send_error(501, e.reason)
+                "urlopen() failed for {} with {}".format(uri, str(e.reason)))
+            # URLError.reason can either be a string or another Exception
+            # So do convert it to a string before sending the error (LP: #1946520)
+            self.send_error(501, str(e.reason))
 
 
     def __get_host_path(self):