diff options
Diffstat (limited to 'scripts/build/chroot_firmware')
| -rwxr-xr-x | scripts/build/chroot_firmware | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/chroot_firmware b/scripts/build/chroot_firmware index 5686de624..4a65d552a 100755 --- a/scripts/build/chroot_firmware +++ b/scripts/build/chroot_firmware @@ -58,11 +58,9 @@ mkdir -p cache/contents.chroot 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" then - # Manually add firmware-linux/non-free meta package if [ "${LB_DERIVATIVE}" != "true" ] then FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" @@ -77,6 +75,8 @@ then fi fi +Firmware_List_From_Contents "${LB_PARENT_MIRROR_CHROOT}" "${LB_PARENT_DISTRIBUTION_CHROOT}" "${LB_PARENT_ARCHIVE_AREAS}" + if [ "${LB_DERIVATIVE}" = "true" ] then # FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents). |