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_apt | 62 ------------------------------------------------ 1 file changed, 62 deletions(-) (limited to 'scripts/build/chroot_apt') diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt index 888edbb2f..b5dec63f8 100755 --- a/scripts/build/chroot_apt +++ b/scripts/build/chroot_apt @@ -142,68 +142,6 @@ case "${1}" in esac fi - case "${LB_MODE}" in - progress-linux) - if [ ! -e chroot/etc/apt/preferences.d/progress-linux.pref ] - then - _DISTRIBUTION="$(echo ${LB_DISTRIBUTION_BINARY} | sed -e 's|-backports||')" - - _ENABLE_DISTRIBUTIONS="${_DISTRIBUTION}" - _DISABLE_DISTRIBUTIONS="" - - if [ "${LB_SECURITY}" = "true" ] - then - _ENABLE_DISTRIBUTIONS="${_ENABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-security" - fi - - if [ "${LB_UPDATES}" = "true" ] - then - _ENABLE_DISTRIBUTIONS="${_ENABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-updates" - fi - - case "${LB_DISTRIBUTION_BINARY}" in - *-backports) - if [ "${LB_BACKPORTS}" = "true" ] - then - _ENABLE_DISTRIBUTIONS="${_ENABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-backports" - fi - ;; - - *) - if [ "${LB_BACKPORTS}" = "true" ] - then - _DISABLE_DISTRIBUTIONS="${_DISABLE_DISTRIBUTIONS} ${_DISTRIBUTION}-backports" - fi - ;; - esac - - for _DISTRIBUTION in ${_ENABLE_DISTRIBUTIONS} - do - -cat >> chroot/etc/apt/preferences.d/progress-linux.pref << EOF - -Package: * -Pin: release n=${_DISTRIBUTION} -Pin-Priority: 999 -EOF - - done - - for _DISTRIBUTION in ${_DISABLE_DISTRIBUTIONS} - do - -cat >> chroot/etc/apt/preferences.d/progress-linux.pref << EOF - -#Package: * -#Pin: release n=${_DISTRIBUTION} -#Pin-Priority: 999 -EOF - - done - fi - ;; - esac - # Creating stage file Create_stagefile ;; -- cgit v1.2.3