From fe5576194eb913a294be0e56e0e5a3d2b7e88f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Tue, 15 Feb 2022 19:43:50 +0100 Subject: [PATCH] Use the classic gadget for raspi images --- debian/changelog | 7 +++++++ live-build/auto/config | 7 +------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 99851a1f..814aaa37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.664.39) UNRELEASED; urgency=medium + + * Switch to building raspi classic images using the 'classic' branch instead + of '18'. This is needed for proper Pi Zero 2 support (LP: #1960950). + + -- Łukasz 'sil2100' Zemczak Tue, 15 Feb 2022 18:59:05 +0100 + livecd-rootfs (2.664.38) focal; urgency=medium * Add sleep due to e2fsck error in umount_partition. LP: #1960537 diff --git a/live-build/auto/config b/live-build/auto/config index c499a22b..b9272eac 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -429,18 +429,13 @@ case $IMAGEFORMAT in # classic images # Certain models have different names but are built from the same source gadget tree - BRANCH=18 + BRANCH=classic case $MODEL in pi-arm64|pi3-arm64) MODEL=pi - BRANCH=18-arm64 - ;; - pi) - BRANCH=18-armhf ;; intel-iot) MODEL=pc - BRANCH=classic ;; esac