diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-02-11 18:08:43 +0000 |
|---|---|---|
| committer | Luca Boccassi <bluca@debian.org> | 2020-03-05 22:13:57 +0000 |
| commit | 94d126c0439ee906e69b78397b233d63c96e5f3e (patch) | |
| tree | 4712f7be7cf50f743440eb2bd3e7af637888109a | |
| parent | aa745de0bbdfec3a2e23f4d76b081664d5d24673 (diff) | |
| download | vyos-live-build-94d126c0439ee906e69b78397b233d63c96e5f3e.tar.gz vyos-live-build-94d126c0439ee906e69b78397b233d63c96e5f3e.zip | |
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
| -rwxr-xr-x | scripts/build/chroot_firmware | 6 | ||||
| -rwxr-xr-x | scripts/build/installer_debian-installer | 6 |
2 files changed, 6 insertions, 6 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). diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index 96e4e7b5c..67573f2e6 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -346,11 +346,9 @@ then 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" @@ -365,6 +363,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). |