diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-05-15 21:23:03 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-05-15 21:52:57 +0200 |
| commit | 6d04c078db61cf343fc1c348f30de4fa42c6cdd7 (patch) | |
| tree | e26c173e9a2660b2889ce820283ea82c59daa7af /scripts/build/lb_chroot_sources | |
| parent | ebc3788bf2447d7a7a0c6bdb39634f044037eaa9 (diff) | |
| download | vyos-live-build-6d04c078db61cf343fc1c348f30de4fa42c6cdd7.tar.gz vyos-live-build-6d04c078db61cf343fc1c348f30de4fa42c6cdd7.zip | |
Correct derivative main sources.list entries.
Diffstat (limited to 'scripts/build/lb_chroot_sources')
| -rwxr-xr-x | scripts/build/lb_chroot_sources | 64 |
1 files changed, 46 insertions, 18 deletions
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources index f2971cf0f..75e73333b 100755 --- a/scripts/build/lb_chroot_sources +++ b/scripts/build/lb_chroot_sources @@ -53,25 +53,39 @@ cat > chroot/etc/apt/sources.list << EOF deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS} EOF + if [ "${LB_SOURCE}" = "true" ] + then + echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list + fi + if [ "${LB_DERIVATIVE}" = "true" ] then cat > chroot/etc/apt/sources.list.d/${LB_MODE}.list << EOF # /etc/apt/sources.list.d/${LB_MODE}.list -deb ${LB_MIRROR_CHROOT} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS} EOF - fi + case "${LB_DISTRIBUTION}" in + *-backports) + _DISTRIBUTIONS="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||') ${LB_DISTRIBUTION}" + ;; - if [ "${LB_SOURCE}" = "true" ] - then - echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list + *) + _DISTRIBUTIONS="${LB_DISTRIBUTION}" + ;; + esac - if [ "${LB_DERIVATIVE}" = "true" ] - then - echo "deb-src ${LB_MIRROR_CHROOT} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list - fi + for _DISTRIBUTION in ${_DISTRIBUTIONS} + do + + echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + + if [ "${LB_SOURCE}" = "true" ] + then + echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + fi + done fi if [ "${LB_SECURITY}" = "true" ] @@ -572,25 +586,39 @@ cat > chroot/etc/apt/sources.list << EOF deb ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS} EOF + if [ "${LB_SOURCE}" = "true" ] + then + echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list + fi + if [ "${LB_DERIVATIVE}" = "true" ] then cat > chroot/etc/apt/sources.list.d/${LB_MODE}.list << EOF # /etc/apt/sources.list.d/${LB_MODE}.list -deb ${LB_MIRROR_BINARY} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS} EOF - fi + case "${LB_DISTRIBUTION}" in + *-backports) + _DISTRIBUTIONS="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||') ${LB_DISTRIBUTION}" + ;; - if [ "${LB_SOURCE}" = "true" ] - then - echo "deb-src ${LB_PARENT_MIRROR_BINARY} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list + *) + _DISTRIBUTIONS="${LB_DISTRIBUTION}" + ;; + esac - if [ "${LB_DERIVATIVE}" = "true" ] - then - echo "deb-src ${LB_MIRROR_BINARY} ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list - fi + for _DISTRIBUTION in ${_DISTRIBUTIONS} + do + + echo "deb ${LB_MIRROR_BINARY} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + + if [ "${LB_SOURCE}" = "true" ] + then + echo "deb-src ${LB_MIRROR_BINARY} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + fi + done fi if [ "${LB_SECURITY}" = "true" ] |