[SCM] live-build branch, debian-next, updated. debian/3.0_a20-1-2-gdf7b3d9

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit df7b3d934f2b31f9e8a783bd1653ab06521a2547
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jun 11 19:36:46 2011 +0200

    Moving installation of live packages to second pass.

diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index aeb3629..d015c04 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -70,6 +70,7 @@ do
 	fi
 done
 
+lb chroot_live-packages ${*}
 lb chroot_local-includes ${*}
 lb chroot_local-patches ${*}
 lb chroot_local-hooks ${*}
diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image
index 39ee0fa..e060ff3 100755
--- a/scripts/build/lb_chroot_linux-image
+++ b/scripts/build/lb_chroot_linux-image
@@ -52,34 +52,7 @@ then
 			echo ${PACKAGE}-${FLAVOUR} >> chroot/root/chroot_packages
 		done
 	done
-fi
-
-# Queue installation of linux-image and ${LB_INITRAMFS}
-if [ "${LB_INITRAMFS}" != "none" ]
-then
-	echo ${LB_INITRAMFS} >> chroot/root/chroot_packages
-fi
 
-# Queue installation of live-config
-if [ "${LB_INITSYSTEM}" != "none" ]
-then
-	echo "live-config live-config-${LB_INITSYSTEM}" >> chroot/root/chroot_packages
+	# Creating stage file
+	Create_stagefile .stage/chroot_linux-image
 fi
-
-# Do initsystem specific hacks
-if [ "${LB_INITSYSTEM}" != "sysvinit" ]
-then
-	# lets see if we still need the squeeze's "pre init system policy discussion" hack:
-
-	IS_SYSVINIT_ESSENTIAL="$(Chroot chroot dpkg-query --show --showformat='${Essential}\n' sysvinit)"
-	RC="$?"
-
-	if [ "${IS_SYSVINIT_ESSENTIAL}" != "no" ] && [ "${RC}" = "0" ]
-	then
-		# sysvinit is both installed and essential, ugly hack to remove it
-		Chroot chroot dpkg --force-remove-essential --remove sysvinit || true
-	fi
-fi
-
-# Creating stage file
-Create_stagefile .stage/chroot_linux-image
diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_live-packages
similarity index 69%
copy from scripts/build/lb_chroot_linux-image
copy to scripts/build/lb_chroot_live-packages
index 39ee0fa..31734a8 100755
--- a/scripts/build/lb_chroot_linux-image
+++ b/scripts/build/lb_chroot_live-packages
@@ -14,7 +14,7 @@ set -e
 . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
 
 # Setting static variables
-DESCRIPTION="$(Echo 'schedule kernel packages for installation')"
+DESCRIPTION="$(Echo 'schedule live packages for installation')"
 HELP=""
 USAGE="${PROGRAM} [--force]"
 
@@ -28,7 +28,7 @@ Set_defaults
 Require_stagefile .stage/config .stage/bootstrap
 
 # Checking stage file
-Check_stagefile .stage/chroot_linux-image
+Check_stagefile .stage/chroot_live-packages
 
 # Checking lock file
 Check_lockfile .lock
@@ -36,34 +36,18 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-# Diverting update-initramfs
-#case "${LB_INITRAMFS}" in
-#	live-boot)
-#		mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-build
-#		;;
-#esac
-
-if [ "${LB_LINUX_PACKAGES}" != "none" ]
-then
-	for FLAVOUR in ${LB_LINUX_FLAVOURS}
-	do
-		for PACKAGE in ${LB_LINUX_PACKAGES}
-		do
-			echo ${PACKAGE}-${FLAVOUR} >> chroot/root/chroot_packages
-		done
-	done
-fi
+_PACKAGES=""
 
 # Queue installation of linux-image and ${LB_INITRAMFS}
 if [ "${LB_INITRAMFS}" != "none" ]
 then
-	echo ${LB_INITRAMFS} >> chroot/root/chroot_packages
+	_PACKAGES="${LB_INITRAMFS}"
 fi
 
 # Queue installation of live-config
 if [ "${LB_INITSYSTEM}" != "none" ]
 then
-	echo "live-config live-config-${LB_INITSYSTEM}" >> chroot/root/chroot_packages
+	_PACKAGES="${_PACKAGES} live-config live-config-${LB_INITSYSTEM}"
 fi
 
 # Do initsystem specific hacks
@@ -81,5 +65,19 @@ then
 	fi
 fi
 
-# Creating stage file
-Create_stagefile .stage/chroot_linux-image
+# Install live packages
+if [ -n "${_PACKAGES}" ]
+then
+	case "${LB_APT}" in
+		apt|apt-get)
+			Chroot chroot "apt-get ${APT_OPTIONS} install ${_PACKAGES}"
+			;;
+
+		aptitude)
+			Chroot chroot "aptitude ${APTITUDE_OPTIONS} install ${_PACKAGES}"
+			;;
+	esac
+
+	# Creating stage file
+	Create_stagefile .stage/chroot_live-packages
+fi

-- 
live-build