[neon/neon/livecd-rootfs/Neon/release] /: Some more changes needed for enabling official intel-iot image builds.

[Łukasz 'sil2100' Zemczak]

Git commit 4cf38c5151accca3ba99612a2599b15d1329b756 by Łukasz 'sil2100' Zemczak.
Committed on 16/08/2021 at 11:04.
Pushed by jriddell into branch 'Neon/release'.

Some more changes needed for enabling official intel-iot image builds.

M  +6    -1    debian/changelog
M  +1    -0    live-build/auto/config

https://invent.kde.org/neon/neon/livecd-rootfs/commit/4cf38c5151accca3ba99612a2599b15d1329b756

diff --git a/debian/changelog b/debian/changelog
index 83f065eb..b8c88de3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,13 @@ livecd-rootfs (2.664.28) UNRELEASED; urgency=medium
 
   [ Brian Murray ]
   * Make sure we're using the 'classic' branch for the intel-iot gadget.
+    (LP: #1938338)
 
- -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com>  Thu, 12 Aug 2021 12:58:24 +0200
+  [ Łukasz 'sil2100' Zemczak ]
+  * Add support for passing SUBPROJECT to classic ubuntu-image calls. This
+    should fix running desktop-preinstalled builds. (LP: #1938338)
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com>  Mon, 16 Aug 2021 13:02:23 +0200
 
 livecd-rootfs (2.664.27) focal; urgency=medium
 
diff --git a/live-build/auto/config b/live-build/auto/config
index 32d7b7ce..001dfb75 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -444,6 +444,7 @@ case $IMAGEFORMAT in
 					;;
 			esac
 
+			UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${SUBPROJECT:+ --subproject \"$SUBPROJECT\"}"
 			UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}"
 			UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${EXTRA_PPAS:+ --extra-ppas \"$EXTRA_PPAS\"}"