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

Adding update repositories as volatile when building in ubuntu mode (Closes: #572983).

This commit is contained in:
Daniel Baumann 2010-03-11 18:03:29 +01:00
parent 3b1124f6c1
commit ca8429ebf4
2 changed files with 66 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
functions/defaults.sh
View File

@ -344,6 +344,18 @@ Set_defaults ()
;;
esac
;;
ubuntu)
case "${LH_ARCHITECTURE}" in
amd64|i386)
LH_MIRROR_CHROOT_VOLATILE="http://security.ubuntu.com/ubuntu/"
;;
*)
LH_MIRROR_CHROOT_VOLATILE="http://ports.ubuntu.com/"
;;
esac
;;
esac
LH_MIRROR_CHROOT_VOLATILE="${LH_MIRROR_CHROOT_VOLATILE:-none}"
@ -412,6 +424,18 @@ Set_defaults ()
;;
esac
;;
ubuntu)
case "${LH_ARCHITECTURE}" in
amd64|i386)
LH_MIRROR_BINARY_VOLATILE="http://security.ubuntu.com/ubuntu/"
;;
*)
LH_MIRROR_BINARY_VOLATILE="http://ports.ubuntu.com/"
;;
esac
;;
esac
LH_MIRROR_BINARY_VOLATILE="${LH_MIRROR_BINARY_VOLATILE:-none}"

58
helpers/chroot_sources
View File

@ -77,15 +77,28 @@ case "${1}" in
if [ "${LH_VOLATILE}" = "true" ]
then
if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
then
echo "deb ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
case "${LH_MODE}" in
debian|debian-release)
if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
then
echo "deb ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LH_SOURCE}" = "true" ]
then
echo "deb-src ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
fi
if [ "${LH_SOURCE}" = "true" ]
then
echo "deb-src ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
fi
;;
ubuntu)
echo "deb ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LH_SOURCE}" = "true" ]
then
echo "deb-src ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
;;
esac
fi
# Check local sources.list
@ -416,15 +429,28 @@ case "${1}" in
if [ "${LH_VOLATILE}" = "true" ]
then
if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
then
echo "deb ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
case "${LH_MODE}" in
debian|debian-release)
if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
then
echo "deb ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LH_SOURCE}" = "true" ]
then
echo "deb-src ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
fi
if [ "${LH_SOURCE}" = "true" ]
then
echo "deb-src ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
fi
;;
ubuntu)
echo "deb ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LH_SOURCE}" = "true" ]
then
echo "deb-src ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
fi
;;
esac
fi
# Check local sources.list