From 14301d4c9d9a16a1662975fd6be59967dabc1a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Fri, 19 Jan 2024 15:13:54 +0100 Subject: [PATCH] Set LIVE_PASSES manually and install ubuntu-image. --- live-build/auto/build | 5 +++++ live-build/auto/config | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/live-build/auto/build b/live-build/auto/build index 76388270..bd66e673 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -156,6 +156,11 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then fi if [ "$PROJECT" = "ubuntu-core-desktop" ]; then + export SNAPPY_STORE_NO_CDN=1 + LB_UBUNTU_IMAGE_CHANNEL="${LB_UBUNTU_IMAGE_CHANNEL:-edge}" + snap install \ + --classic --channel="$LB_UBUNTU_IMAGE_CHANNEL" ubuntu-image + # Special case for ubuntu-core-desktop - we need to call # ubuntu-image twice, once for the core image payload and # then for the actual image. diff --git a/live-build/auto/config b/live-build/auto/config index 78dd3a96..9dc0760b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -833,6 +833,10 @@ case $PROJECT in size: @SIZE@ variant: core EOF + + # we have to manually mark the live layer as the LIVE_PASS, since it's also + # the only layer we build + LIVE_PASSES="live" ;; ubuntu-oem)