From 945a166f75f7bf0419a7caefa7e7337119732929 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Thu, 19 Mar 2020 00:19:26 +0000 Subject: strip progress-linux distro hacks progress-linux, as discussed in MR #142 ([1]) is a little known distro, which appears to be little more than a personal project of the original author of live-build. given that, the expense of maintaining all of these old hacks for it cannot be justified. it is not known whether or not live-build is even used with respect to it since the author abandoned live-build some years ago. also, at least one past change in live-build possibly broke progress-linux compatibility anyway, which would have required progress-linux users of live-build to use a custom progress-linux config, or a progress-linux fork of live-build, and there is no knowing how much of the hacks in this "upstream" codebase any user of progress-linux currently relies upon. and again, progress-linux appears to just be a personal project of Daniel's, with afaik very little userbase. (Daniel seems to be the only developer working on the project which speaks to how small it is). [1]: https://salsa.debian.org/live-team/live-build/-/merge_requests/142 Gbp-Dch: Short --- scripts/build/chroot_firmware | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'scripts/build/chroot_firmware') diff --git a/scripts/build/chroot_firmware b/scripts/build/chroot_firmware index e23026bb5..11a4f41ae 100755 --- a/scripts/build/chroot_firmware +++ b/scripts/build/chroot_firmware @@ -54,20 +54,9 @@ Check_package host /usr/bin/wget wget FIRMWARE_PACKAGES="" # Manually add firmware-linux/non-free meta package -if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" +if [ "${LB_DERIVATIVE}" = "false" ] && echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" then - if [ "${LB_DERIVATIVE}" != "true" ] - then - FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" - else - case "${LB_DERIVATIVE_IS_BASED_ON}" in - debian) - FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" - ;; - *) - ;; - esac - fi + FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} firmware-linux" fi Firmware_List_From_Contents "${LB_PARENT_MIRROR_CHROOT}" "${LB_PARENT_DISTRIBUTION_CHROOT}" "${LB_PARENT_ARCHIVE_AREAS}" -- cgit v1.2.3