From 27043f1ee55dfa0bafbde49b7f5b01f4eedc871f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Tue, 25 Oct 2022 20:38:08 +0200 Subject: [PATCH] Firmware package for Rpi was changed - renaming it (#4344) Also remove older releases as we removed support anyway --- config/sources/families/bcm2711.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/sources/families/bcm2711.conf b/config/sources/families/bcm2711.conf index bc38dd23a4..d20a2fc1bc 100644 --- a/config/sources/families/bcm2711.conf +++ b/config/sources/families/bcm2711.conf @@ -68,12 +68,12 @@ extension_prepare_config__prepare_rpi_flash_kernel() { display_alert "Preparing bcm2711" "${RELEASE}, distro kernel?: ${RASPI_DISTRO_KERNEL}" "info" export RASPI_DISTRO_KERNEL="${RASPI_DISTRO_KERNEL:-no}" # Include a distro-built kernel? export SERIALCON="${RASPI_SERIALCON:-tty1}" # HDMI etc, not serial. most people don't have UART on rpi - local usable_releases="focal|hirsute|impish|jammy|kinetic" + local usable_releases="jammy|kinetic" if [[ "$RELEASE" =~ ^(${usable_releases})$ ]]; then - export FK__EXTRA_PACKAGES="rpi-eeprom linux-firmware linux-firmware-raspi2 libraspberrypi-bin cloud-initramfs-growroot" + export FK__EXTRA_PACKAGES="rpi-eeprom linux-firmware linux-firmware-raspi libraspberrypi-bin cloud-initramfs-growroot" - if [[ "$RELEASE" =~ ^(hirsute|impish|jammy|kinetic)$ ]]; then # Add raspi-config for those releases that have it; it might be useful. + if [[ "$RELEASE" =~ ^(jammy|kinetic)$ ]]; then # Add raspi-config for those releases that have it; it might be useful. export FK__EXTRA_PACKAGES="${FK__EXTRA_PACKAGES} raspi-config" fi @@ -81,7 +81,7 @@ extension_prepare_config__prepare_rpi_flash_kernel() { unset KERNELSOURCE # Make sure Armbian will not try to compile from source. export FK__KERNEL_PACKAGES="${FK__KERNEL_PACKAGES} linux-tools-raspi linux-raspi linux-image-raspi " # Ubuntu Impish+ split the kernel modules, add the extra ones too. - if [[ "$RELEASE" =~ ^(impish|jammy|kinetic)$ ]]; then + if [[ "$RELEASE" =~ ^(jammy|kinetic)$ ]]; then export FK__KERNEL_PACKAGES="${FK__KERNEL_PACKAGES} linux-modules-extra-raspi" fi fi