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

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 9698d3a4f4c6597eb94b07909e367e95200576c2
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu May 31 11:37:22 2012 +0200

    Moving firmware symlink creation to the end of binary_debian-installer in order to ensure to take only the latest packages into account that get into the image, regardless if they come from the archive or are localy included.

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 003051b..a309898 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -508,23 +508,6 @@ then
 		done
 	fi
 
-	# Symlink firmware packages to /firmware
-	if [ -n "${DI_FIRMWARE_PACKAGES}" ]
-	then
-		mkdir -p binary/firmware
-		cd binary/firmware
-
-		for _PACKAGE in ${DI_FIRMWARE_PACKAGES}
-		do
-			for _FILE in $(find ../pool -name "${_PACKAGE}_*.deb")
-			do
-				ln -s ${_FILE} ./
-			done
-		done
-
-		cd "${OLDPWD}"
-	fi
-
 	if [ "${LB_DEBIAN_INSTALLER}" != "live" ]
 	then
 		# Including base debian packages
@@ -581,6 +564,23 @@ then
 		Download_file binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Release "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/${_ARCHIVE_AREA}/binary-"${LB_ARCHITECTURES}"/Release
 	done
 
+	# Symlink firmware packages to /firmware
+	if [ -n "${DI_FIRMWARE_PACKAGES}" ]
+	then
+		mkdir -p binary/firmware
+		cd binary/firmware
+
+		for _PACKAGE in ${DI_FIRMWARE_PACKAGES}
+		do
+			for _FILE in $(find ../pool -name "${_PACKAGE}_*.deb")
+			do
+				ln -s ${_FILE} ./
+			done
+		done
+
+		cd "${OLDPWD}"
+	fi
+
 	# Udeb handling
 	mkdir binary.udeb
 	cd binary.udeb

-- 
live-build