From 4cf38c5151accca3ba99612a2599b15d1329b756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Mon, 16 Aug 2021 13:04:25 +0200 Subject: [PATCH] Some more changes needed for enabling official intel-iot image builds. --- debian/changelog | 7 ++++++- live-build/auto/config | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) 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 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 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\"}"