summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-01-07 21:09:49 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:20:41 +0100
commitd0a5dac9713f2031383fed1d78130ef770d891b6 (patch)
treee569ee34ba0b1797d61bef9b51cd365b62434d88 /scripts
parent41a68e481917532433eeb3db56e5cf9df3f0325c (diff)
downloadvyos-live-build-d0a5dac9713f2031383fed1d78130ef770d891b6.tar.gz
vyos-live-build-d0a5dac9713f2031383fed1d78130ef770d891b6.zip
Removing unused debian-release mode.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/lb_binary_disk5
-rwxr-xr-xscripts/build/lb_chroot_sources8
-rwxr-xr-xscripts/build/lb_source_disk5
3 files changed, 4 insertions, 14 deletions
diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk
index 0e03bf6ed..c2f8c4741 100755
--- a/scripts/build/lb_binary_disk
+++ b/scripts/build/lb_binary_disk
@@ -60,11 +60,6 @@ case "${LB_MODE}" in
TRACE="project/trace/ftp-master.debian.org"
;;
- debian-release)
- STRING="Official ${ARCHITECTURE}"
- TRACE="project/trace/ftp-master.debian.org"
- ;;
-
ubuntu)
TITLE="Ubuntu"
STRING="Build ${ARCHITECTURE}"
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index 7e163d954..f7fd3ba26 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -87,7 +87,7 @@ EOF
if [ "${LB_VOLATILE}" = "true" ]
then
case "${LB_MODE}" in
- debian|debian-release|ubuntu)
+ debian|ubuntu)
echo "deb ${LB_MIRROR_CHROOT_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ]
@@ -101,7 +101,7 @@ EOF
if [ "${LB_BACKPORTS}" = "true" ]
then
case "${LB_MODE}" in
- debian|debian-release)
+ debian)
if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ]
then
echo "deb ${LB_MIRROR_CHROOT_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
@@ -519,7 +519,7 @@ EOF
if [ "${LB_VOLATILE}" = "true" ]
then
case "${LB_MODE}" in
- debian|debian-release|ubuntu)
+ debian|ubuntu)
echo "deb ${LB_MIRROR_BINARY_VOLATILE} ${LB_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
if [ "${LB_SOURCE}" = "true" ]
@@ -533,7 +533,7 @@ EOF
if [ "${LB_BACKPORTS}" = "true" ]
then
case "${LB_MODE}" in
- debian|debian-release)
+ debian)
if [ "${LB_DISTRIBUTION}" != "sid" ] && [ "${LB_DISTRIBUTION}" != "unstable" ]
then
echo "deb ${LB_MIRROR_BINARY_BACKPORTS} ${LB_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
diff --git a/scripts/build/lb_source_disk b/scripts/build/lb_source_disk
index edc7f0d8f..a7cb526bf 100755
--- a/scripts/build/lb_source_disk
+++ b/scripts/build/lb_source_disk
@@ -60,11 +60,6 @@ case "${LB_MODE}" in
TRACE="project/trace/ftp-master.debian.org"
;;
- debian-release)
- STRING="Official ${ARCHITECTURE}"
- TRACE="project/trace/ftp-master.debian.org"
- ;;
-
ubuntu)
TITLE="Ubuntu"
STRING="Build ${ARCHITECTURE}"