Support building pi3-arm64 core18 images. At the same time, make sure we still use the right gadget tree repository for the classic arm64 pi3 image.

This commit is contained in:
Łukasz 'sil2100' Zemczak 2019-02-06 18:11:27 +01:00
parent 039ed8ec31
commit 8c8b7164d4
2 changed files with 17 additions and 1 deletions

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.561) UNRELEASED; urgency=medium
* Support building pi3-arm64 core18 images. At the same time, make sure we
still use the right gadget tree repository for the classic arm64 pi3
image.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Wed, 06 Feb 2019 18:07:06 +0100
livecd-rootfs (2.560) disco; urgency=medium
[ Colin Watson ]

View File

@ -341,8 +341,10 @@ case $IMAGEFORMAT in
MODEL=dragonboard ;;
armhf+raspi2)
MODEL=pi2 ;;
armhf+raspi3|arm64+raspi3)
armhf+raspi3)
MODEL=pi3 ;;
arm64+raspi3)
MODEL=pi3-arm64 ;;
armhf+cm3)
MODEL=cm3 ;;
*)
@ -379,6 +381,12 @@ case $IMAGEFORMAT in
else
# classic images
# Certain models have different names but are built from the same source gadget tree
case $MODEL in
pi3-arm64)
MODEL=pi3 ;;
esac
UBUNTU_IMAGE_ARGS=""
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}"
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${EXTRA_PPAS:+ --extra-ppas \"$EXTRA_PPAS\"}"