[SCM] live-build branch, debian-old-2.0, updated. debian/2.0.1-1-5-gc6ac01d
Daniel Baumann
daniel at debian.org
Mon Sep 27 14:20:23 UTC 2010
The following commit has been merged in the debian-old-2.0 branch:
commit c6ac01d096ceed247f66eb64355d72ab7818dfad
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Sep 27 16:19:41 2010 +0200
Handling live.debian.net repository differently, so that ubuntu people can use it too.
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index 60654dc..334803a 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -151,6 +151,14 @@ EOF
then
for REPOSITORY in ${LB_REPOSITORIES}
do
+ # ubuntu workaround to allow using live.debian.net
+ if [ "${LB_MODE}" = "ubuntu" ] && [ "${REPOSITORY}" = "live.debian.net" ]
+ then
+ _DISTRIBUTION="sid"
+ else
+ _DISTRIBUTION="${LB_DISTRIBUTION}"
+ fi
+
for PLACE in config/repositories "${LB_BASE}/repositories"
do
# Prefer repositories from the config tree
@@ -163,13 +171,13 @@ EOF
# Adding sources.list entries (chroot)
if [ -e "${PLACE}/${REPOSITORY}.chroot" ]
then
- sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
+ sed -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \
-e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
"${PLACE}/${REPOSITORY}.chroot" > \
"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
elif [ -e "${PLACE}/${REPOSITORY}" ]
then
- sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \
+ sed -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \
-e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \
"${PLACE}/${REPOSITORY}" > \
"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
--
live-build
More information about the debian-live-changes
mailing list