Use the raspi KERNEL_FLAVOUR for the raspi images.

xnox/risc64
Łukasz 'sil2100' Zemczak 5 years ago
parent c6febea65e
commit d2a2ac41a4

8
debian/changelog vendored

@ -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 <lukasz.zemczak@ubuntu.com> Wed, 08 Apr 2020 10:03:21 +0200
livecd-rootfs (2.657) focal; urgency=medium livecd-rootfs (2.657) focal; urgency=medium
* server: networkd applies the first sorted matching network file, thus * server: networkd applies the first sorted matching network file, thus

@ -912,15 +912,9 @@ case $ARCH in
armhf|arm64) armhf|arm64)
KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}" KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
case $SUBARCH in 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) raspi)
# Generic Raspberry Pi images # Generic Raspberry Pi images
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
KERNEL_FLAVOURS=raspi2
add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant
BINARY_REMOVE_LINUX=false BINARY_REMOVE_LINUX=false
;; ;;

Loading…
Cancel
Save