manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Detect firmware-linux, without references for Debian versions

This commit is contained in:
Roland Clobus 2023-03-14 20:28:00 +01:00
parent 50c7e1a8b7
commit 18ad612b72
No known key found for this signature in database
GPG Key ID: 62C57C6AA61495BD
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/build/chroot_firmware
View File

@ -53,11 +53,9 @@ Check_package host /usr/bin/wget wget
FIRMWARE_PACKAGES="" FIRMWARE_PACKAGES=""
# Manually add firmware-linux/non-free-firmware meta package # Manually add firmware-linux meta package if available
if [ "${LB_DERIVATIVE}" = "false" ] && In_list "non-free-firmware" ${LB_PARENT_ARCHIVE_AREAS}; then if [ $(apt-cache show "^firmware-linux$" 2> /dev/null | grep "^Package:" | wc -l) -eq 1 ]
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" then
elif [ "${LB_DERIVATIVE}" = "false" ] && In_list "non-free" ${LB_PARENT_ARCHIVE_AREAS}; then
# Buster and older
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
fi fi

8
scripts/build/installer_debian-installer
View File

@ -401,11 +401,9 @@ then
FIRMWARE_PACKAGES="" FIRMWARE_PACKAGES=""
# Manually add firmware-linux/non-free meta package # Manually add firmware-linux meta package if available
if [ "${LB_DERIVATIVE}" = "false" ] && In_list "non-free-firmware" ${LB_PARENT_ARCHIVE_AREAS}; then if [ $(apt-cache show "^firmware-linux$" 2> /dev/null | grep "^Package:" | wc -l) -eq 1 ]
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" then
elif [ "${LB_DERIVATIVE}" = "false" ] && In_list "non-free" ${LB_PARENT_ARCHIVE_AREAS}; then
# Buster and older
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
fi fi