[SCM] live-build branch, debian-next, updated. debian/3.0_a48-1-18-g00fc92b

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 00fc92b78e014216bc74b6af4fc4e6f66b3ae626
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Jun 4 11:10:47 2012 +0200

    Caching contents for automatic firmware package selection.

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index c6bf324..a0dca80 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -413,11 +413,16 @@ then
 		# Assumption: firmware packages install files into /lib/firmware
 
 		# Get all firmware packages names
-		FIRMWARE_PACKAGES="$(wget ${WGET_OPTIONS} ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz -O - | gunzip -c | awk '/^lib\/firmware/ { print $2 }' | sort -u)"
+		mkdir -p cache/contents.binary_debian-installer
+		wget ${WGET_OPTIONS} ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz -O - | gunzip -c > cache/contents.binary_debian-installer/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES}
+
+		FIRMWARE_PACKAGES="$(awk '/^lib\/firmware/ { print $2 }' cache/contents.binary_debian-installer/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)"
 
 		if [ "${LB_DERIVATIVE}" = "true" ]
 		then
-			FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(wget ${WGET_OPTIONS} ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz -O - | gunzip -c | awk '/^lib\/firmware/ { print $2 }' | sort -u)"
+			wget {WGET_OPTIONS} ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz -O - | gunzip -c > cache/contents.binary_debian-installer/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES}
+
+			FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.binary_debian-installer/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)"
 		fi
 
 		# Filter out contrib packages if contrib is not enabled

-- 
live-build