diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-09-14 20:43:20 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-09-14 20:43:20 +0200 |
| commit | ad269a6b71b81f46cb3dbda129e8a72799e9088d (patch) | |
| tree | 6252e5e3d7b7cf50cd11693f37a1cd9d6173e259 | |
| parent | f38ef7f469ca31f96fda42da265c8d2c90b897ee (diff) | |
| download | vyos-live-build-ad269a6b71b81f46cb3dbda129e8a72799e9088d.tar.gz vyos-live-build-ad269a6b71b81f46cb3dbda129e8a72799e9088d.zip | |
Updating volatile handling in chroot_archives for derivatives when using foo-backports distribution scheme.
| -rwxr-xr-x | scripts/build/lb_chroot_archives | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives index 327ee692c..d14dac899 100755 --- a/scripts/build/lb_chroot_archives +++ b/scripts/build/lb_chroot_archives @@ -165,11 +165,21 @@ EOF if [ "${LB_DERIVATIVE}" = "true" ] && [ "${LB_MIRROR_CHROOT_VOLATILE}" != "none" ] then - echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + case "${LB_MODE}" in + progress) + _DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')" + ;; + + *) + _DISTRIBUTION="${LB_DISTRIBUTION}" + ;; + esac + + echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_CHROOT_VOLATILE} ${_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi fi @@ -716,11 +726,21 @@ EOF if [ "${LB_DERIVATIVE}" = "true" ] && [ "${LB_MIRROR_BINARY_VOLATILE}" != "none" ] then - echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + case "${LB_MODE}" in + progress) + _DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')" + ;; + + *) + _DISTRIBUTION="${LB_DISTRIBUTION}" + ;; + esac + + echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_BINARY_VOLATILE} ${_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi fi |