From 2508d5add30e635f4575a3ff896e9e9de42e9c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Wed, 5 Apr 2023 22:14:30 +0200 Subject: [PATCH] Use ubuntu-image from a snap (candidate for now). Only build raspi images with ubuntu-image 3.0 for now. --- debian/control | 1 - live-build/auto/build | 1 + live-build/auto/config | 5 ++--- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 4f53e0e6..18cdafbc 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,6 @@ Depends: ${misc:Depends}, snapd (>= 2.39) [!i386], squashfs-tools (>= 1:3.3-1), sudo, - ubuntu-image [!i386 !riscv64], python3-vmdkstream [amd64 i386], xz-utils, zerofree diff --git a/live-build/auto/build b/live-build/auto/build index 0b4304fa..bcf0bf21 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -90,6 +90,7 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then # Use ubuntu-image instead of live-build export SNAPPY_STORE_NO_CDN=1 + snap install --classic --channel=candidate/latest ubuntu-image # TODO: eventually, this should be handled by a single ubuntu-image # call without having to do a conditional on ubuntu-core/classic. diff --git a/live-build/auto/config b/live-build/auto/config index 7401b946..e22474e1 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -334,9 +334,8 @@ if [ -z "${IMAGEFORMAT:-}" ]; then case $PROJECT:${SUBPROJECT:-} in ubuntu-cpc:*|ubuntu:desktop-preinstalled|ubuntu-wsl:*) case $ARCH+${SUBARCH:-} in - *+raspi|riscv64+?*) - # All raspi and RISC-V images that *have* a SUBARCH will now - # use ubuntu-image. + *+raspi) + # All raspi images use ubuntu-image. IMAGEFORMAT=ubuntu-image ;; *)