Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-06 16:31:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imported 2.664.1

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2020-05-14 08:18:35 +00:00
parent 60ef378e61
commit d3d8ad977c
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
debian/changelog vendored
View File

@ -1,3 +1,14 @@
livecd-rootfs (2.664.1) focal; urgency=medium
* Bump only the UC20 pc image to 8GB, and keep Pi images as small as possible.
(LP: #1875430)
* ubuntu-image: fix focal+ pi images for armhf to use pi-armhf model name.
(LP: #1876358)
* ubuntu-image: drop ubuntu-image dep on riscv64, as not installable yet.
(LP: #1876359)
-- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 01 May 2020 20:08:23 +0100
livecd-rootfs (2.664) focal; urgency=medium livecd-rootfs (2.664) focal; urgency=medium
[ Patrick Viafore ] [ Patrick Viafore ]

2
debian/control vendored
View File

@ -38,7 +38,7 @@ Depends: ${misc:Depends},
squashfs-tools (>= 1:3.3-1), squashfs-tools (>= 1:3.3-1),
sudo, sudo,
u-boot-tools [armhf arm64], u-boot-tools [armhf arm64],
ubuntu-image [!i386], ubuntu-image [!i386 !riscv64],
python3-vmdkstream [amd64 i386], python3-vmdkstream [amd64 i386],
xz-utils, xz-utils,
zerofree zerofree

16
live-build/auto/config
View File

@ -359,8 +359,16 @@ case $IMAGEFORMAT in
CHANNEL="${CHANNEL:-edge}" CHANNEL="${CHANNEL:-edge}"
case $MODEL in case $MODEL in
pc-amd64|pc-i386) pc-amd64|pc-i386)
[ -z "${SUBARCH:-}" ] \ if [ -z "${SUBARCH:-}" ]; then
&& UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M" case $SUITE in
xenial|bionic)
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
;;
*)
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 8G"
;;
esac
fi
;; ;;
*) ;; *) ;;
esac esac
@ -375,7 +383,9 @@ case $IMAGEFORMAT in
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL" UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
;; ;;
*) *)
UBUNTU_IMAGE_ARGS="--image-size 10G" if [ "${MODEL}" = "pi" ]; then
MODEL=pi-armhf
fi
# Ubuntu Core 20 # Ubuntu Core 20
# Currently uc20 assertions do not support global # Currently uc20 assertions do not support global
# channel overrides, instead we have per-channel models # channel overrides, instead we have per-channel models