manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Lyndon Brown 2020-02-25 02:33:50 +00:00 committed by Luca Boccassi
parent ee2bbe4578
commit 9f2b7b40e8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions/sourcelist.sh
View File

@ -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
}

4
scripts/build/bootstrap_archives
View File

@ -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

8
scripts/build/chroot_archives
View File

@ -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