[SCM] live-helper branch, debian-next, updated. debian/2.0_a12-1-14-gf91ed30

Daniel Baumann daniel at debian.org
Fri May 21 05:31:40 UTC 2010


The following commit has been merged in the debian-next branch:
commit f91ed30b612aaba8956d9cdc28164d74db5c3e10
Author: Cody A.W. Somerville <cody.somerville at canonical.com>
Date:   Fri May 21 07:25:26 2010 +0200

    Standardize to machine readable package manifest.

diff --git a/helpers/binary_manifest b/helpers/binary_manifest
index a3c304a..4ec95eb 100755
--- a/helpers/binary_manifest
+++ b/helpers/binary_manifest
@@ -45,9 +45,6 @@ Create_lockfile .lock
 case "${LH_INITRAMFS}" in
 	casper)
 		INITFS="casper"
-
-		# Add filesystem.manifest
-		Chroot chroot "dpkg --get-selections" | awk '{ print $1 }' | sort -u > binary/casper/filesystem.manifest
 		;;
 
 	live-initramfs)
@@ -55,16 +52,10 @@ case "${LH_INITRAMFS}" in
 		;;
 esac
 
-# Add packages.list
-cat > binary/${INITFS}/packages.txt << EOF
-This file contains the list of all packages installed in this live system.
-
-
-EOF
-
-Chroot chroot "dpkg -l" >> binary/${INITFS}/packages.txt
-
-cp binary/${INITFS}/packages.txt binary.packages
+# Add filesystem.manifest
+Chroot chroot "dpkg-query -W" > binary/"${INITFS}"/filesystem.manifest
+# Copy filesystem.manifest in image to binary.manifest as build output.
+cp binary/"${INITFS}"/filesystem.manifest binary.manifest
 
 # Creating stage file
 Create_stagefile .stage/binary_manifest

-- 
live-helper



More information about the debian-live-changes mailing list