diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-02-25 02:33:50 +0000 |
|---|---|---|
| committer | Luca Boccassi <bluca@debian.org> | 2020-03-10 12:50:39 +0000 |
| commit | 9f2b7b40e8fb32133a9d41f9a2a02bef86bb83ed (patch) | |
| tree | 1bfdb9bde7a20d6da13413abf70da83411496b2b | |
| parent | ee2bbe45782f52d115115b8cf6198afaeb03be9e (diff) | |
| download | vyos-live-build-9f2b7b40e8fb32133a9d41f9a2a02bef86bb83ed.tar.gz vyos-live-build-9f2b7b40e8fb32133a9d41f9a2a02bef86bb83ed.zip | |
archives: always include enabled/disabled deb-src apt entries
LB_APT_SOURCE_ARCHIVES determines whether or not deb-src entries are
desired to be included in apt's sources.list. here, instead of excuding
them we always include them but commented out where they would previously
have been excluded. this means that if a user later changes their mind and
wants to make use of them all they have to do is uncomment them rather
than add the necessary lines.
Gbp-Dch: Short
Closes: #952929
| -rwxr-xr-x | functions/sourcelist.sh | 4 | ||||
| -rwxr-xr-x | scripts/build/bootstrap_archives | 4 | ||||
| -rwxr-xr-x | scripts/build/chroot_archives | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/functions/sourcelist.sh b/functions/sourcelist.sh index b11f00373..b00187554 100755 --- a/functions/sourcelist.sh +++ b/functions/sourcelist.sh @@ -129,9 +129,9 @@ Create_apt_sources_list () # Disable deb-src entries? if [ "${_PASS}" != "source" ] && [ "${LB_APT_SOURCE_ARCHIVES}" != "true" ]; then - sed -i "/^deb-src /d" "${PARENT_LIST_FILE}" + sed -i "s/^deb-src/#deb-src/g" "${PARENT_LIST_FILE}" if [ "${LB_DERIVATIVE}" = "true" ]; then - sed -i "/^deb-src /d" "${LIST_FILE}" + sed -i "s/^deb-src/#deb-src/g" "${LIST_FILE}" fi fi } diff --git a/scripts/build/bootstrap_archives b/scripts/build/bootstrap_archives index 292ec1e04..80ec52ceb 100755 --- a/scripts/build/bootstrap_archives +++ b/scripts/build/bootstrap_archives @@ -66,8 +66,8 @@ do if [ "${_PASS}" != "source" ] && [ "${LB_APT_SOURCE_ARCHIVES}" = "false" ] then - # Strip out source archives - sed -i "/^deb-src /d" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" + # Disable source archives + sed -i "s/^deb-src/#deb-src/g" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" fi fi done diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index 8d47a1417..70515b140 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -68,8 +68,8 @@ case "${1}" in if [ "${_PASS}" != "source" ] && [ "${LB_APT_SOURCE_ARCHIVES}" = "false" ] then - # Strip out source archives - sed -i "/^deb-src /d" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" + # Disable source archives + sed -i "s/^deb-src/#deb-src/g" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" fi fi done @@ -380,8 +380,8 @@ case "${1}" in if [ "${_PASS}" != "source" ] && [ "${LB_APT_SOURCE_ARCHIVES}" = "false" ] then - # Strip out source archives - sed -i "/^deb-src /d" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary)" + # Disable source archives + sed -i "s/^deb-src/#deb-src/g" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary)" fi fi done |