From 944188fa4d7cabda91bf82fc9bd6470b0c59048a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Sat, 11 Jun 2011 11:37:14 +0100
Subject: [PATCH] --packages is being removed, so create a local package list
 instead

---
 live-build/auto/config | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/live-build/auto/config b/live-build/auto/config
index ba756d6f..c75200a3 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -18,8 +18,19 @@ case $(hostname --fqdn) in
 	*)			;;
 esac
 
+mkdir -p config/local-packagelists
+rm -f config/local-packagelists/livecd-rootfs.list
+
+add_package ()
+{
+	local pkg
+
+	for pkg; do
+		echo "$pkg" >> config/local-packagelists/livecd-rootfs.list
+	done
+}
+
 OPTS=
-PACKAGES=
 TASKS=
 LIVE_TASKS=
 COMPONENTS=
@@ -28,11 +39,11 @@ BINARY_REMOVE_LINUX=true
 case $IMAGEFORMAT in
 	ext2|ext3)
 		OPTS="${OPTS:+$OPTS }--initramfs none"
-		PACKAGES="${PACKAGES:+$PACKAGES }jasper"
+		add_package jasper
 		;;
 
 	*)
-		PACKAGES="${PACKAGES:+$PACKAGES }lupin-casper"
+		add_package lupin-casper
 		;;
 esac
 
@@ -61,7 +72,7 @@ case $PROJECT in
 
 	xubuntu)
 		TASKS='minimal standard xubuntu-desktop'
-		PACKAGES="${PACKAGES:+$PACKAGES }xterm"
+		add_package xterm
 		LIVE_TASKS='edubuntu-live'
 		COMPONENTS='main restricted universe multiverse'
 		;;
@@ -105,11 +116,11 @@ case $ARCH in
 				BINARY_REMOVE_LINUX=false
 				;;
 			omap)
-				PACKAGES="${PACKAGES:+$PACKAGES }x-loader-omap3-beagle u-boot-linaro-omap3-beagle"
+				add_package x-loader-omap3-beagle u-boot-linaro-omap3-beagle
 				BINARY_REMOVE_LINUX=false
 				;;
 			omap4)
-				PACKAGES="${PACKAGES:+$PACKAGES }x-loader-omap4-panda u-boot-linaro-omap4-panda"
+				add_package x-loader-omap4-panda u-boot-linaro-omap4-panda
 				BINARY_REMOVE_LINUX=false
 				;;
 		esac
@@ -129,7 +140,6 @@ lb config noauto \
 	--initsystem none \
 	--bootloader none \
 	--initramfs-compression lzma \
-	${PACKAGES:+--packages "$PACKAGES"} \
 	${TASKS:+--tasks "$TASKS"} \
 	${LIVE_TASKS:+--live-tasks "$LIVE_TASKS"} \
 	$OPTS