[SCM] live-build branch, debian, updated. debian/3.0_a46-1-21-g4b333fb

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 4a182167c787e167ddc616954d29d01d087e26c6
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Apr 26 22:49:57 2012 +0200

    Automatically preseed some known firmware packages.

diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image
index 344dfbb..ad094c5 100755
--- a/scripts/build/lb_chroot_linux-image
+++ b/scripts/build/lb_chroot_linux-image
@@ -92,6 +92,13 @@ then
 		do
 			echo $(echo ${_PACKAGE} | awk -F/ '{ print $NF }') >> chroot/root/packages.chroot
 		done
+
+# Some known licenses required to be accepted
+cat >> chroot/root/packages.chroot.cfg << EOF
+firmware-ivtv firmware-ivtv/license/accepted boolean true
+firmware-ipw2x00 firmware-ipw2x00/license/accepted boolean true
+EOF
+
 	fi
 
 	# Creating stage file
diff --git a/scripts/build/lb_chroot_preseed b/scripts/build/lb_chroot_preseed
index f100ade..893b0f5 100755
--- a/scripts/build/lb_chroot_preseed
+++ b/scripts/build/lb_chroot_preseed
@@ -39,7 +39,8 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 if ls config/preseed/*.preseed > /dev/null 2>&1 || \
-   ls config/preseed/*.preseed.chroot > /dev/null 2>&1
+   ls config/preseed/*.preseed.chroot > /dev/null 2>&1 || \
+   ls chroot/root/packages.chroot.cfg > /dev/null 2>&1
 then
 	# Check dependency
 	Check_package chroot/usr/bin/debconf-set-selections debconf
@@ -47,7 +48,7 @@ then
 	# Install dependency
 	Install_package
 
-	for PRESEED in config/preseed/*.preseed config/preseed/*.preseed.chroot
+	for PRESEED in config/preseed/*.preseed config/preseed/*.preseed.chroot chroot/root/packages.chroot.cfg
 	do
 		if [ -e "${PRESEED}" ]
 		then
@@ -61,6 +62,8 @@ then
 		fi
 	done
 
+	rm -f chroot/root/packages.chroot.cfg
+
 	# Remove dependency
 	Remove_package
 

-- 
live-build