From d2a2ac41a4a7f8afe81a6b2615654da5f0716113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Wed, 8 Apr 2020 10:06:09 +0200 Subject: [PATCH] Use the raspi KERNEL_FLAVOUR for the raspi images. --- debian/changelog | 8 ++++++++ live-build/auto/config | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index d123f41c..b764969a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.658) UNRELEASED; urgency=medium + + * Remove some deprecated raspi2 special-casing, switch the main universal + raspi SUBARCH to use the raspi KERNEL_FLAVOUR now that the kernel packages + have been renamed. + + -- Łukasz 'sil2100' Zemczak Wed, 08 Apr 2020 10:03:21 +0200 + livecd-rootfs (2.657) focal; urgency=medium * server: networkd applies the first sorted matching network file, thus diff --git a/live-build/auto/config b/live-build/auto/config index 6302715a..8f619055 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -912,15 +912,9 @@ case $ARCH in armhf|arm64) KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}" case $SUBARCH in - raspi2) - COMPONENTS='main restricted universe multiverse' - add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant - BINARY_REMOVE_LINUX=false - ;; raspi) # Generic Raspberry Pi images COMPONENTS='main restricted universe multiverse' - KERNEL_FLAVOURS=raspi2 add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant BINARY_REMOVE_LINUX=false ;;