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

Daniel Baumann daniel at debian.org
Fri Apr 27 10:06:06 UTC 2012


The following commit has been merged in the debian branch:
commit 0af78a1f67c04d2561e8134deb565b6f5ccf6a77
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Apr 27 00:20:40 2012 +0200

    Slight reordering in lb_binary_debian-installer.

diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 904f1c6..003051b 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -339,11 +339,6 @@ then
 	# Downloading additional packages
 	mkdir -p chroot/binary.deb/archives/partial
 
-	for _ARCHIVE_AREA in $(echo ${LB_PARENT_ARCHIVE_AREAS} ${LB_ARCHIVE_AREAS})
-	do
-		mkdir -p binary/pool/${_ARCHIVE_AREA}
-	done
-
 	mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
 	touch chroot/var/lib/dpkg/status
 
@@ -489,8 +484,7 @@ then
 		mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
 
 		# Download .debs of the required packages
-		Chroot chroot ${_LB_APT_COMMAND} install ${DI_REQ_PACKAGES}
-		Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES}
+		Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES} ${DI_REQ_PACKAGES}
 	else
 		# Download .debs of the required packages
 		Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES}
@@ -501,6 +495,11 @@ then
 
 	mv chroot/binary.deb ./
 
+	for _ARCHIVE_AREA in $(echo ${LB_PARENT_ARCHIVE_AREAS} ${LB_ARCHIVE_AREAS})
+	do
+		mkdir -p binary/pool/${_ARCHIVE_AREA}
+	done
+
 	if Find_files binary.deb/archives/*.deb
 	then
 		for FILE in binary.deb/archives/*.deb

-- 
live-build



More information about the debian-live-changes mailing list