From 6e8b5b94c4a9f8db4afbaf566ebdb36110f08592 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Fri, 1 May 2020 19:50:41 +0100 Subject: [PATCH 1/2] ubuntu-image: fix focal+ pi images for armhf to use pi-armhf model name. LP: #1876358 --- live-build/auto/config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/live-build/auto/config b/live-build/auto/config index 088a6f19..fb6ca877 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -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 From e25aec1ca2367ffb106b4ed2b919120e4e5375cb Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Fri, 1 May 2020 19:52:02 +0100 Subject: [PATCH 2/2] ubuntu-image: fix focal+ pi images for armhf to use pi-armhf model name. (LP: #1876358) --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cf0b758c..9fb55d20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 01 May 2020 19:47:10 +0100 + -- Dimitri John Ledkov Fri, 01 May 2020 19:51:57 +0100 livecd-rootfs (2.664) focal; urgency=medium