reproducible Debian: refactoring

Signed-off-by: Holger Levsen <holger@layer-acht.org>

bin/reproducible_debstrap.sh

@@ -28,8 +28,8 @@ cleanup() {
 }
 
 cleanup_unreproducible_file(){
-	TYPE=$1
-	FILE=$2
+	local TYPE=$1
+	local FILE=$2
 	if [ -f $FILE ] ; then
 		output_echo "Warning: modifying $TOOL result, deleting $TYPE $FILE"
 		sudo rm -rf --one-file-system $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}/$FILE
@@ -76,17 +76,21 @@ for LOOP in "first" "second" ; do
 				;;
 		debootstrap|cdebootstrap)
 				sudo $REALTOOL $SUITE $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}
-				# work around logfiles and files kept by both debootstrap and cdebootstrap
-				for FILE in /var/log/bootstrap.log /var/log/dpkg.log /var/log/alternatives.log ; do
+				# work around unreproducible artifacts
+				case ${TOOL} in
+					debootstrap)	BAD_LOGFILES="/var/log/bootstrap.log /var/log/dpkg.log /var/log/alternatives.log"
+							BAD_FILES="/etc/machine-id /var/cache/ldconfig/aux-cache"
+							;;
+					cdebootstrap)	BAD_LOGFILES="/var/log/bootstrap.log /var/log/dpkg.log /var/log/alternatives.log /var/log/apt/history.log /var/log/apt/term.log"
+							BAD_FILES="/etc/machine-id"
+							;;
+				esac
+				for FILE in $BAD_LOGFILES ; do
 					cleanup_unreproducible_file "unreproducible logfile" $FILE
 				done
-				for FILE in /etc/machine-id /var/cache/ldconfig/aux-cache ; do
+				for FILE in $BAD_FILES ; do
 					cleanup_unreproducible_file "unreproducible file" $FILE
 				done
-				# work around some more logfiles kept only by cdebootstrap
-				for FILE in /var/log/apt/history.log /var/log/apt/term.log /var/log/bootstrap.log ; do
-					cleanup_unreproducible_file "unreproducible logfile" $FILE
-				done
 				sudo tar --mtime="@$SOURCE_DATE_EPOCH" --clamp-mtime -C $BUILDDIR/$SUBDIR/${TOOL}/ -cf $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}.tar ${SUITE}
 				sudo rm -rf --one-file-system $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}
 				;;