From 5d9af7f3c59ec6e47bfac1483064f25ffbd80e63 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Tue, 27 Oct 2020 20:26:50 +0000 Subject: [PATCH 1/2] auto/config: seed ubuntu-desktop when building hyperv image Regression introduced in 38157b37487d244b27af33f7863e6b15253c8f94 when desktop-preinstalled code branch was added, it dropped addint ubuntu-desktop task. Instead it added ubuntu-desktop-raspi task, only for the raspi subarch, which depends on ubuntu-desktop. But the hyperv case, now ended up without ubuntu-desktop task. It looks like introduction of "desktop-preinstalled" assumed, that it is for raspi only, when in fact that code path now started to be used for hyperv gallery image too. --- live-build/auto/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/auto/config b/live-build/auto/config index 22278d55..76c04563 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -601,7 +601,7 @@ case $PROJECT in ;; desktop-preinstalled) - add_task install minimal standard + add_task install minimal standard ubuntu-desktop if [ "$SUBARCH" = "raspi" ]; then add_task install ubuntu-desktop-raspi fi From 1c7d688319490a8a15a5aab47fb086482b3efe92 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Tue, 27 Oct 2020 20:42:08 +0000 Subject: [PATCH 2/2] auto/config: scope ubuntu:desktop-preinstalled:raspi image options When desktop-preinstalled image options were added in 38157b37487d244b27af33f7863e6b15253c8f94, for the raspi subarch, the options listed there were not scoped for raspi subarch. This results in those options getting also applied for the HYPERV ubuntu:desktop-preinstalled image. Thus scope the newly added options under raspi subarch case only. --- live-build/auto/config | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index 76c04563..444f0abd 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -604,14 +604,16 @@ case $PROJECT in add_task install minimal standard ubuntu-desktop if [ "$SUBARCH" = "raspi" ]; then add_task install ubuntu-desktop-raspi + # XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project + # for existing raspi preinstalled images + # XXX: I would prefer to use --hdd-label=desktop-rootfs like 040-hyperv-desktop-images.binary + OPTS="${OPTS:+$OPTS }--initramfs=none" + OPTS="${OPTS:+$OPTS }--system=normal" + OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs" + OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096" + OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15" fi - # XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project - # for existing raspi preinstalled images - OPTS="${OPTS:+$OPTS }--initramfs=none" - OPTS="${OPTS:+$OPTS }--system=normal" - OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs" - OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096" - OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15" + ## Otherwise HYPERV image options.... *crickets* see the hyperv hook ;; *)