[SCM] live-build branch, debian-next, updated. debian/3.0_a49-1-5-ga5a651f

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit a5a651f08d2ed1f505b1d5ede6d81462f59bc0a9
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jun 5 17:40:52 2012 +0200

    Updating live-media checksum names for newer live-boot.

diff --git a/scripts/build/lb_binary_checksums b/scripts/build/lb_binary_checksums
index c23fe45..b5ba6b9 100755
--- a/scripts/build/lb_binary_checksums
+++ b/scripts/build/lb_binary_checksums
@@ -43,12 +43,14 @@ Create_lockfile .lock
 
 for CHECKSUM in ${LB_CHECKSUMS}
 do
-	Echo_message "Begin creating binary ${CHECKSUM}sum.txt..."
+	CHECKSUMS="$(echo ${CHECKSUM} | tr [a-z] [A-Z])SUMS"
+
+	Echo_message "Begin creating binary ${CHECKSUMS}..."
 
 	# Remove old checksums
-	if [ -f binary/${CHECKSUM}sum.txt ]
+	if [ -f binary/${CHECKSUMS} ]
 	then
-		rm -f binary/${CHECKSUM}sum.txt
+		rm -f binary/${CHECKSUMS}
 	fi
 
 	# Calculating checksums
@@ -57,22 +59,20 @@ do
 		\! -path './isolinux/isolinux.bin' \
 		\! -path './boot/boot.bin' \
 		\! -path './boot/grub/stage2_eltorito' \
-		\! -path './md5sum.txt' \
-		\! -path './sha1sum.txt' \
-		\! -path './sha256sum.txt' \
-	-print0 | sort -z | xargs -0 ${CHECKSUM}sum > ../${CHECKSUM}sum.txt
+		\! -path './*SUMS' \
+	-print0 | sort -z | xargs -0 ${CHECKSUM}sum > ../${CHECKSUMS}
 
-cat > ${CHECKSUM}sum.txt << EOF
+cat > ${CHECKSUMS} << EOF
 This file contains the list of ${CHECKSUM} checksums of all files on this medium.
 
 You can verify them automatically with the 'integrity-check' boot parameter,
-or, manually with: '${CHECKSUM}sum -c ${CHECKSUM}sum.txt'.
+or, manually with: '${CHECKSUM}sum -c ${CHECKSUMS}'.
 
 
 EOF
 
-	cat ../${CHECKSUM}sum.txt >> ${CHECKSUM}sum.txt
-	rm -f ../${CHECKSUM}sum.txt
+	cat ../${CHECKSUMS} >> ${CHECKSUMS}
+	rm -f ../${CHECKSUMS}
 
 	cd "${OLDPWD}"
 done
diff --git a/scripts/build/lb_source_checksums b/scripts/build/lb_source_checksums
index 4c8ac08..f21d7ae 100755
--- a/scripts/build/lb_source_checksums
+++ b/scripts/build/lb_source_checksums
@@ -50,33 +50,33 @@ do
 
 	for CHECKSUM in ${LB_CHECKSUMS}
 	do
-		Echo_message "Begin creating source ${CHECKSUM}sum.txt..."
+		CHECKSUMS="$(echo ${CHECKSUM} | tr [a-z] [A-Z])SUMS"
+
+		Echo_message "Begin creating source ${CHECKSUMS}..."
 
 		# Remove old checksums
-		if [ -f ${DIRECTORY}/${CHECKSUM}sum.txt ]
+		if [ -f ${DIRECTORY}/${CHECKSUMS} ]
 		then
-			rm -f ${DIRECTORY}/${CHECKSUM}sum.txt
+			rm -f ${DIRECTORY}/${CHECKSUMS}
 		fi
 
 		# Calculating checksums
 		cd ${DIRECTORY}
 		find . -type f \
-			\! -path './md5sum.txt' \
-			\! -path './sha1sum.txt' \
-			\! -path './sha256sum.txt' \
-		-print0 | sort -z | xargs -0 ${CHECKSUM}sum > ../${CHECKSUM}sum.txt
+			\! -path './*SUMS' \
+		-print0 | sort -z | xargs -0 ${CHECKSUM}sum > ../${CHECKSUMS}
 
-cat > ${CHECKSUM}sum.txt << EOF
+cat > ${CHECKSUMS} << EOF
 This file contains the list of ${CHECKSUM} checksums of all files on this medium.
 
 You can verify them automatically with the 'integrity-check' boot parameter,
-or, manually with: '${CHECKSUM}sum -c ${CHECKSUM}sum.txt'.
+or, manually with: '${CHECKSUM}sum -c ${CHECKSUMS}'.
 
 
 EOF
 
-		cat ../${CHECKSUM}sum.txt >> ${CHECKSUM}sum.txt
-		rm -f ../${CHECKSUM}sum.txt
+		cat ../${CHECKSUMS} >> ${CHECKSUMS}
+		rm -f ../${CHECKSUMS}
 
 		cd "${OLDPWD}"
 	done

-- 
live-build