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

firmware: robustify and simplify archive area checking

This commit is contained in:
Lyndon Brown 2020-03-28 13:05:27 +00:00 committed by Raphaël Hertzog
parent 9a91ca9fde
commit 3d2b280c8f
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/build/chroot_firmware
View File

@ -54,8 +54,7 @@ Check_package host /usr/bin/wget wget
FIRMWARE_PACKAGES="" FIRMWARE_PACKAGES=""
# Manually add firmware-linux/non-free meta package # Manually add firmware-linux/non-free meta package
if [ "${LB_DERIVATIVE}" = "false" ] && echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" if [ "${LB_DERIVATIVE}" = "false" ] && In_list "non-free" ${LB_PARENT_ARCHIVE_AREAS}; then
then
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
fi fi
@ -91,8 +90,7 @@ do
done done
# Some known licenses required to be accepted # Some known licenses required to be accepted
if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" if In_list "non-free" ${LB_PARENT_ARCHIVE_AREAS}; then
then
cat >> chroot/root/packages.chroot.cfg << EOF cat >> chroot/root/packages.chroot.cfg << EOF
firmware-ivtv firmware-ivtv/license/accepted boolean true firmware-ivtv firmware-ivtv/license/accepted boolean true

3
scripts/build/installer_debian-installer
View File

@ -326,8 +326,7 @@ then
FIRMWARE_PACKAGES="" FIRMWARE_PACKAGES=""
# Manually add firmware-linux/non-free meta package # Manually add firmware-linux/non-free meta package
if [ "${LB_DERIVATIVE}" = "false" ] && echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" if [ "${LB_DERIVATIVE}" = "false" ] && In_list "non-free" ${LB_PARENT_ARCHIVE_AREAS}; then
then
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
fi fi