diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-28 13:05:27 +0000 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-04-23 15:46:43 +0200 |
| commit | 3d2b280c8f44fe8b5fe52fdd0622f4e044ca98da (patch) | |
| tree | 7f31863f7d0fe8a191ebb84bd1252e512ed94cac | |
| parent | 9a91ca9fde8eb2b15a3294fe95f99990d8cf9227 (diff) | |
| download | vyos-live-build-3d2b280c8f44fe8b5fe52fdd0622f4e044ca98da.tar.gz vyos-live-build-3d2b280c8f44fe8b5fe52fdd0622f4e044ca98da.zip | |
firmware: robustify and simplify archive area checking
| -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 |