From 18ad612b722e672bbd1ae8323f992d27153795ca Mon Sep 17 00:00:00 2001 From: Roland Clobus Date: Tue, 14 Mar 2023 20:28:00 +0100 Subject: [PATCH] Detect firmware-linux, without references for Debian versions --- scripts/build/chroot_firmware | 8 +++----- scripts/build/installer_debian-installer | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/scripts/build/chroot_firmware b/scripts/build/chroot_firmware index 1617b83f7..e22068f1c 100755 --- a/scripts/build/chroot_firmware +++ b/scripts/build/chroot_firmware @@ -53,11 +53,9 @@ Check_package host /usr/bin/wget wget FIRMWARE_PACKAGES="" -# Manually add firmware-linux/non-free-firmware meta package -if [ "${LB_DERIVATIVE}" = "false" ] && In_list "non-free-firmware" ${LB_PARENT_ARCHIVE_AREAS}; then - FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" -elif [ "${LB_DERIVATIVE}" = "false" ] && In_list "non-free" ${LB_PARENT_ARCHIVE_AREAS}; then - # Buster and older +# Manually add firmware-linux meta package if available +if [ $(apt-cache show "^firmware-linux$" 2> /dev/null | grep "^Package:" | wc -l) -eq 1 ] +then FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" fi diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index dcfb20fae..7dbfce7ce 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -401,11 +401,9 @@ then FIRMWARE_PACKAGES="" - # Manually add firmware-linux/non-free meta package - if [ "${LB_DERIVATIVE}" = "false" ] && In_list "non-free-firmware" ${LB_PARENT_ARCHIVE_AREAS}; then - FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" - elif [ "${LB_DERIVATIVE}" = "false" ] && In_list "non-free" ${LB_PARENT_ARCHIVE_AREAS}; then - # Buster and older + # Manually add firmware-linux meta package if available + if [ $(apt-cache show "^firmware-linux$" 2> /dev/null | grep "^Package:" | wc -l) -eq 1 ] + then FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" fi