Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-12 11:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ubuntu-image from a snap (candidate for now). Only build raspi images with ubuntu-image 3.0 for now.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2023-04-05 22:14:30 +02:00
parent c56e7aab04
commit 2508d5add3
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/control vendored
View File

@ -37,7 +37,6 @@ Depends: ${misc:Depends},
snapd (>= 2.39) [!i386], snapd (>= 2.39) [!i386],
squashfs-tools (>= 1:3.3-1), squashfs-tools (>= 1:3.3-1),
sudo, sudo,
ubuntu-image [!i386 !riscv64],
python3-vmdkstream [amd64 i386], python3-vmdkstream [amd64 i386],
xz-utils, xz-utils,
zerofree zerofree

1
live-build/auto/build
View File

@ -90,6 +90,7 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
# Use ubuntu-image instead of live-build # Use ubuntu-image instead of live-build
export SNAPPY_STORE_NO_CDN=1 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 # TODO: eventually, this should be handled by a single ubuntu-image
# call without having to do a conditional on ubuntu-core/classic. # call without having to do a conditional on ubuntu-core/classic.

5
live-build/auto/config
View File

@ -334,9 +334,8 @@ if [ -z "${IMAGEFORMAT:-}" ]; then
case $PROJECT:${SUBPROJECT:-} in case $PROJECT:${SUBPROJECT:-} in
ubuntu-cpc:*|ubuntu:desktop-preinstalled|ubuntu-wsl:*) ubuntu-cpc:*|ubuntu:desktop-preinstalled|ubuntu-wsl:*)
case $ARCH+${SUBARCH:-} in case $ARCH+${SUBARCH:-} in
*+raspi|riscv64+?*) *+raspi)
# All raspi and RISC-V images that *have* a SUBARCH will now # All raspi images use ubuntu-image.
# use ubuntu-image.
IMAGEFORMAT=ubuntu-image IMAGEFORMAT=ubuntu-image
;; ;;
*) *)