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

firmware: reorder firmware list construction 

the 'manually add firmware-linux package' bit was stuck inbetween the
parent and non-parent logic, which was especially unhelpful before we
de-duplicated the logic into a common function.

Gbp-Dch: Short
This commit is contained in:
Lyndon Brown 2020-02-11 18:08:43 +00:00 committed by Luca Boccassi
parent aa745de0bb
commit 94d126c043
2 changed files with 6 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

@ -58,11 +58,9 @@ mkdir -p cache/contents.chroot
FIRMWARE_PACKAGES="" FIRMWARE_PACKAGES=""
Firmware_List_From_Contents "${LB_PARENT_MIRROR_CHROOT}" "${LB_PARENT_DISTRIBUTION_CHROOT}" "${LB_PARENT_ARCHIVE_AREAS}" # Manually add firmware-linux/non-free meta package
if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
then then
# Manually add firmware-linux/non-free meta package
if [ "${LB_DERIVATIVE}" != "true" ] if [ "${LB_DERIVATIVE}" != "true" ]
then then
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
@ -77,6 +75,8 @@ then
fi fi
fi fi
Firmware_List_From_Contents "${LB_PARENT_MIRROR_CHROOT}" "${LB_PARENT_DISTRIBUTION_CHROOT}" "${LB_PARENT_ARCHIVE_AREAS}"
if [ "${LB_DERIVATIVE}" = "true" ] if [ "${LB_DERIVATIVE}" = "true" ]
then then
# FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents). # FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents).

6
scripts/build/installer_debian-installer
View File

@ -346,11 +346,9 @@ then
FIRMWARE_PACKAGES="" FIRMWARE_PACKAGES=""
Firmware_List_From_Contents "${LB_PARENT_MIRROR_CHROOT}" "${LB_PARENT_DISTRIBUTION_CHROOT}" "${LB_PARENT_ARCHIVE_AREAS}" # Manually add firmware-linux/non-free meta package
if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
then then
# Manually add firmware-linux/non-free meta package
if [ "${LB_DERIVATIVE}" != "true" ] if [ "${LB_DERIVATIVE}" != "true" ]
then then
FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux"
@ -365,6 +363,8 @@ then
fi fi
fi fi
Firmware_List_From_Contents "${LB_PARENT_MIRROR_CHROOT}" "${LB_PARENT_DISTRIBUTION_CHROOT}" "${LB_PARENT_ARCHIVE_AREAS}"
if [ "${LB_DERIVATIVE}" = "true" ] if [ "${LB_DERIVATIVE}" = "true" ]
then then
# FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents). # FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents).