diff options
| -rwxr-xr-x | scripts/build/chroot_firmware | 6 | ||||
| -rwxr-xr-x | scripts/build/installer_debian-installer | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/scripts/build/chroot_firmware b/scripts/build/chroot_firmware index 02bc9f2de..1b346a822 100755 --- a/scripts/build/chroot_firmware +++ b/scripts/build/chroot_firmware @@ -54,8 +54,7 @@ Check_package host /usr/bin/wget wget FIRMWARE_PACKAGES="" # Manually add firmware-linux/non-free meta package -if [ "${LB_DERIVATIVE}" = "false" ] && echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" -then +if [ "${LB_DERIVATIVE}" = "false" ] && In_list "non-free" ${LB_PARENT_ARCHIVE_AREAS}; then FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" fi @@ -91,8 +90,7 @@ do done # Some known licenses required to be accepted -if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" -then +if In_list "non-free" ${LB_PARENT_ARCHIVE_AREAS}; then cat >> chroot/root/packages.chroot.cfg << EOF firmware-ivtv firmware-ivtv/license/accepted boolean true diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index 1488ace79..81beebeae 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -326,8 +326,7 @@ then FIRMWARE_PACKAGES="" # Manually add firmware-linux/non-free meta package - if [ "${LB_DERIVATIVE}" = "false" ] && echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" - then + if [ "${LB_DERIVATIVE}" = "false" ] && In_list "non-free" ${LB_PARENT_ARCHIVE_AREAS}; then FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" fi |