summaryrefslogtreecommitdiff
path: root/scripts/build/source_debian
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-03-19 00:19:26 +0000
committerLuca Boccassi <bluca@debian.org>2020-03-20 10:19:33 +0000
commit945a166f75f7bf0419a7caefa7e7337119732929 (patch)
tree7fd12a81255c8d9a65e9a309510b93fc71a0929e /scripts/build/source_debian
parentd6a80d3d4dfe7153ba48c4fb1d1037557223a233 (diff)
downloadvyos-live-build-945a166f75f7bf0419a7caefa7e7337119732929.tar.gz
vyos-live-build-945a166f75f7bf0419a7caefa7e7337119732929.zip
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
Diffstat (limited to 'scripts/build/source_debian')
-rwxr-xr-xscripts/build/source_debian39
1 files changed, 0 insertions, 39 deletions
diff --git a/scripts/build/source_debian b/scripts/build/source_debian
index e1555d14f..b9899b2bc 100755
--- a/scripts/build/source_debian
+++ b/scripts/build/source_debian
@@ -103,37 +103,6 @@ then
echo "${LB_TASKSEL}" >> source-selection.txt
fi
-# apt-get source does not respect pinning
-# building images with backports included but not enabled
-# will result in apt-get source download stuff from backports
-# where available. workaround: disable backports
-case "${LB_MODE}" in
- progress-linux)
- case "${LB_DISTRIBUTION_BINARY}" in
- *-backports)
-
- ;;
-
- *)
- if grep -qs "${LB_DISTRIBUTION_BINARY}-backports" chroot/etc/apt/sources.list.d/progress-linux.list
- then
- cp chroot/etc/apt/sources.list.d/progress-linux.list chroot/etc/apt/sources.list.d/progress-linux.list.orig
-
- while read -r _LINE
- do
- if echo "${_LINE}" | grep -qs ${LB_DISTRIBUTION_BINARY}-backports
- then
- sed -i -e "s|${_LINE}|#${_LINE}|" chroot/etc/apt/sources.list.d/progress-linux.list
- fi
- done < chroot/etc/apt/sources.list.d/progress-linux.list.orig
-
- Apt chroot update
- fi
- ;;
- esac
- ;;
-esac
-
# Make a clean directory to download the packages to.
# We need to set the ownership to user `_apt` to give write access to the apt user,
# otherwise we get a lot of warnings from apt about downloading as root.
@@ -202,14 +171,6 @@ done
rmdir --ignore-fail-on-non-empty chroot/source.pkgs
-# Reverting apt sources again
-if [ -e chroot/etc/apt/sources.list.d/progress-linux.list.orig ]
-then
- mv chroot/etc/apt/sources.list.d/progress-linux.list.orig chroot/etc/apt/sources.list.d/progress-linux.list
-
- Apt chroot update
-fi
-
# Creating stage file
Create_stagefile
Create_stagefile "source"