From 0b9436878acc109ecef1106eb65144a442d2818c Mon Sep 17 00:00:00 2001
From: CloudBuilder <cloud-image-builders@lists.canonical.com>
Date: Tue, 12 May 2020 23:54:26 +0000
Subject: [PATCH] Imported 2.666

No reason for CPC update specified.
---
 debian/changelog                | 14 ++++++++++++++
 debian/gbp.conf                 |  3 +++
 live-build/auto/config          | 16 ++++++++--------
 live-build/functions            | 16 +++++-----------
 live-build/make-lxd-metadata.py |  1 +
 5 files changed, 31 insertions(+), 19 deletions(-)
 create mode 100644 debian/gbp.conf

diff --git a/debian/changelog b/debian/changelog
index a10b8cf7..88e725fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+livecd-rootfs (2.666) groovy; urgency=medium
+
+  [ Balint Reczey ]
+  * debian/gbp.conf: Add minimal configuration for branch and tag naming
+
+  [ Michael Hudson-Doyle ]
+  * Call udevadm settle before kpartx -d
+
+  [ Dimitri John Ledkov ]
+  * Fixup indentation
+  * make-lxd-metadata: add riscv64 lxd architecture tag
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 12 May 2020 12:29:16 +0100
+
 livecd-rootfs (2.665) groovy; urgency=medium
 
   * Bump only the UC20 pc image to 8GB, and keep Pi images as small as possible.
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 00000000..63e89550
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+debian-branch=ubuntu/master
+debian-tag = %(version)s
diff --git a/live-build/auto/config b/live-build/auto/config
index fb6ca877..7ad94ccb 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -360,14 +360,14 @@ case $IMAGEFORMAT in
 			case $MODEL in
 				pc-amd64|pc-i386)
 					if [ -z "${SUBARCH:-}" ]; then
-					case $SUITE in
-						xenial|bionic)
-							UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
-							;;
-						*)
-							UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 8G"
-							;;
-					esac
+						case $SUITE in
+							xenial|bionic)
+								UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
+								;;
+							*)
+								UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 8G"
+								;;
+						esac
 					fi
 					;;
 				*) ;;
diff --git a/live-build/functions b/live-build/functions
index d86f27d6..e9fbb507 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -14,18 +14,12 @@ clean_loops() {
     local kpartx_stdout
 
     if [ -n "${backing_img}" ]; then
-        # sync before removing loop to avoid "Device or resource busy" errors
+        # If something just finished writing to the device or a
+        # partition (e.g. the zerofree in umount_partition) udev might
+        # still be processing the device.
+        udevadm settle
         sync
-        kpartx_ret=""
-        kpartx_stdout=$(kpartx -v -d "${backing_img}") || kpartx_ret=$?
-        echo "$kpartx_stdout"
-        if [ -n "$kpartx_ret" ]; then
-            if echo "$kpartx_stdout" | grep -q "loop deleted"; then
-                echo "Suppressing kpartx returning error (#860894)"
-            else
-                exit $kpartx_ret
-            fi
-        fi
+        kpartx -v -d "${backing_img}"
         unset backing_img
     fi
 
diff --git a/live-build/make-lxd-metadata.py b/live-build/make-lxd-metadata.py
index 896f811a..e90277c8 100755
--- a/live-build/make-lxd-metadata.py
+++ b/live-build/make-lxd-metadata.py
@@ -17,6 +17,7 @@ lxd_arches = {
     "powerpc": "ppc",
     "ppc64el": "ppc64le",
     "s390x": "s390x",
+    "riscv64": "riscv64",
     }