[neon/neon/livecd-rootfs/Neon/release] /: new version

[Jonathan Riddell]

Git commit 87cd06610ea28c7b1f293628e7f2f6051e31420f by Jonathan Riddell.
Committed on 29/11/2021 at 10:19.
Pushed by jriddell into branch 'Neon/release'.

new version

M  +15   -0    debian/changelog
M  +3    -0    live-build/auto/build
M  +8    -3    live-build/auto/config
M  +4    -2    magic-proxy

https://invent.kde.org/neon/neon/livecd-rootfs/commit/87cd06610ea28c7b1f293628e7f2f6051e31420f

diff --git a/debian/changelog b/debian/changelog
index 59477607..7e0552aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+livecd-rootfs (2.664.35) focal; urgency=medium
+
+  [ Thomas Bechtold ]
+  * magic-proxy: fix exception handling for URLError (LP: #1946520)
+
+ -- Brian Murray <brian at ubuntu.com>  Thu, 18 Nov 2021 15:42:45 -0800
+
+livecd-rootfs (2.664.34) focal; 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. (LP: #1951173)
+
+ -- Brian Murray <brian at ubuntu.com>  Tue, 16 Nov 2021 17:18:59 -0800
+
 livecd-rootfs (2.664.33) focal; urgency=medium
 
   * Install cloud-initramfs-growroot to actually enable rootfs resize.
diff --git a/live-build/auto/build b/live-build/auto/build
index 682301f2..845c6107 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -863,6 +863,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
diff --git a/live-build/auto/config b/live-build/auto/config
index f2fdd3b2..ed749bde 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -613,7 +613,7 @@ case $PROJECT in
 					# grow the rootfs, manually install cloud-initramfs-growroot during build
 					add_package install cloud-initramfs-growroot
 				    	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"
@@ -626,6 +626,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
 		;;
@@ -864,7 +868,7 @@ case $PROJECT in
 			amd64*)
 				if [ "${SUBARCH:-}" = "intel-iot" ]; then
 					KERNEL_FLAVOURS=image-intel
-					COMPONENTS='main restricted universe'
+					COMPONENTS='main restricted'
 					OPTS="${OPTS:+$OPTS }--initramfs=none"
 				fi
 				;;
@@ -1031,8 +1035,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
diff --git a/magic-proxy b/magic-proxy
index 10f19c47..af765c32 100755
--- a/magic-proxy
+++ b/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):