diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-03-11 18:03:29 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:05 +0100 |
| commit | 000ff0a0b04a8878b580eefc1a7c22486d7d4471 (patch) | |
| tree | 5ef6f62a9f5c546149c2b499e98d6516e3c9556c | |
| parent | a625ce959b096c61f50c03c6b5e0be09df4bb11e (diff) | |
| download | live-build-000ff0a0b04a8878b580eefc1a7c22486d7d4471.zip live-build-000ff0a0b04a8878b580eefc1a7c22486d7d4471.tar.gz | |
Adding update repositories as volatile when building in ubuntu mode (Closes: #572983).
| -rwxr-xr-x | functions/defaults.sh | 24 | ||||
| -rwxr-xr-x | helpers/chroot_sources | 58 |
2 files changed, 66 insertions, 16 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 05ab2fc..0862254 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -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}" diff --git a/helpers/chroot_sources b/helpers/chroot_sources index 87db111..8e456fd 100755 --- a/helpers/chroot_sources +++ b/helpers/chroot_sources @@ -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 |