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

Merge branch 'xnox/fix-pi-models' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master

Browse Source
This commit is contained in:
Dimitri John Ledkov 2020-05-01 19:53:29 +01:00
commit ecfe6658fc
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -2,8 +2,10 @@ livecd-rootfs (2.664ubuntu1) UNRELEASED; 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)
-- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 01 May 2020 19:47:10 +0100
-- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 01 May 2020 19:51:57 +0100
livecd-rootfs (2.664) focal; urgency=medium

3
live-build/auto/config
View File

@ -383,6 +383,9 @@ case $IMAGEFORMAT in
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
;;
*)
if [ "${MODEL}" = "pi" ]; then
MODEL=pi-armhf
fi
# Ubuntu Core 20
# Currently uc20 assertions do not support global
# channel overrides, instead we have per-channel models