Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-07 17:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop building per-pi-flavor images and only build a pi generic image for core18. (LP: #1861520)

Browse Source
This commit is contained in:
Steve Langasek 2020-02-27 12:17:28 -08:00
parent e2dd084fe0
commit d516e68807
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.525.40) bionic; urgency=medium
* Stop building per-pi-flavor images and only build a pi generic image for
core18. (LP: #1861520)
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Fri, 31 Jan 2020 16:57:01 +0100
livecd-rootfs (2.525.39) bionic; urgency=medium livecd-rootfs (2.525.39) bionic; urgency=medium
* Ensure seed partition is mounted on no-cloud images which use system-boot * Ensure seed partition is mounted on no-cloud images which use system-boot

18
live-build/auto/config
View File

@ -182,12 +182,10 @@ case $IMAGEFORMAT in
MODEL=pc-i386 ;; MODEL=pc-i386 ;;
arm64+snapdragon) arm64+snapdragon)
MODEL=dragonboard ;; MODEL=dragonboard ;;
armhf+raspi2) armhf+raspi3)
MODEL=pi2 ;; MODEL=pi ;;
armhf+raspi3|arm64+raspi3) arm64+raspi3)
MODEL=pi3 ;; MODEL=pi-arm64 ;;
armhf+cm3)
MODEL=cm3 ;;
armhf+imx6) armhf+imx6)
MODEL=nitrogen6x ;; MODEL=nitrogen6x ;;
*) *)
@ -240,6 +238,14 @@ case $IMAGEFORMAT in
else else
# classic images # classic images
# Certain models have different names but are built from the same source gadget tree
case $MODEL in
pi-arm64|pi)
# XXX: Temporarily this is still built from the pi3 tree,
# but eventually we'll use the pi one.
MODEL=pi3 ;;
esac
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}" UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}"
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${EXTRA_PPAS:+ --extra-ppas \"$EXTRA_PPAS\"}" UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${EXTRA_PPAS:+ --extra-ppas \"$EXTRA_PPAS\"}"