[SCM] live-build branch, debian-next, updated. debian/3.0_a4-1-1-g5cb7e4a

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 5cb7e4ae6c89c1f4a8889371092ae0b2f189dfa3
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Oct 4 15:49:08 2010 +0200

    Removing --binary-pool again, not ready yet.
    
    See #598935, #598991 and and
    http://lists.debian.org/debian-live/2010/10/msg00079.html
    for details.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index a935674..fcc6ae7 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -830,8 +830,6 @@ Set_defaults ()
 		LB_BINARY_INDICES="${LB_BINARY_INDICES:-true}"
 	fi
 
-	LB_BINARY_POOL="${LB_BINARY_POOL:-false}"
-
 	# Setting bootloader
 	if [ -z "${LB_BOOTLOADER}" ]
 	then
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 173c5cc..b5ca068 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -420,9 +420,8 @@ case "${LB_CHROOT_FILESYSTEM}" in
 				;;
 		esac
 		;;
-esac
 
-rm -f chroot/etc/apt/sources.list.d/live-media.list
+esac
 
 for STAGE in ${LB_CACHE_STAGES}
 do
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index 365abbf..61b0a70 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -216,16 +216,6 @@ then
 	rm -f chroot/etc/fstab
 fi
 
-if [ "${LB_BINARY_POOL}" = "true" ]
-then
-	echo "deb file:/live/image/debian ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list.d/live-media.list
-
-	if [ "${LB_SOURCE}" = "true" ]
-	then
-		echo "deb-src file:/live/image/debian ${LB_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/live-media.list
-	fi
-fi
-
 if [ "${LB_EXPOSED_ROOT}" = "true" ]
 then
 	# Make sure RW dirs exist so that the initramfs script has
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 455d313..3d0583e 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -41,7 +41,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [-b|--binary-images iso|net|tar|usb-hdd]\n\
 \t    [--binary-filesystem fat16|fat32]\n\
 \t    [--binary-indices true|false|none]\n\
-\t    [--binary-pool true|false]\n\
 \t    [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\
 \t    [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\
 \t    [--bootloader grub|syslinux|yaboot]\n\
@@ -148,7 +147,7 @@ Local_arguments ()
 		mirror-binary-security:,mirror-binary-volatile:,mirror-binary-backports:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
 		gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
 		packages:,packages-lists:,tasks:,security:,volatile:,backports:,sysvinit:,binary-filesystem:,binary-images:,
-		binary-indices:,binary-pool:,bootappend-install:,bootappend-live:,bootloader:,checksums:,build-with-chroot:,
+		binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,build-with-chroot:,
 		debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
 		encryption:,grub-splash:,hostname:,isohybrid-options:,iso-application:,iso-preparer:,iso-publisher:,
 		iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:,
@@ -543,11 +542,6 @@ Local_arguments ()
 				shift 2
 				;;
 
-			--binary-pool)
-				LB_BINARY_POOL="${2}"
-				shift 2
-				;;
-
 			--bootappend-live)
 				LB_BOOTAPPEND_LIVE="${2}"
 				shift 2
@@ -1154,10 +1148,6 @@ LB_BINARY_IMAGES="${LB_BINARY_IMAGES}"
 # (Default: ${LB_BINARY_INDICES})
 LB_BINARY_INDICES="${LB_BINARY_INDICES}"
 
-# \$LB_BINARY_POOL: enable live-media repository in live system
-# (Default: ${LB_BINARY_POOL})
-LB_BINARY_POOL="${LB_BINARY_POOL}"
-
 # \$LB_BOOTAPPEND_LIVE: set boot parameters
 # (Default: empty)
 LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE}"

-- 
live-build