[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: work around two more files kept by debootstrap

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
4bdda15e by Holger Levsen at 2022-08-29T20:32:49+02:00
reproducible Debian: work around two more files kept by debootstrap

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

- - - - -


1 changed file:

- bin/reproducible_debstrap.sh


Changes:

=====================================
bin/reproducible_debstrap.sh
=====================================
@@ -61,10 +61,14 @@ for LOOP in "first" "second" ; do
 		mmdebstrap)	sudo $REALTOOL $SUITE > $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}.tar
 				;;
 		debootstrap)	sudo $REALTOOL $SUITE $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}
-				for i in /var/log/bootstrap.log /var/log/dpkg.log /var/log/alternatives.log ; do
+				for LOGFILE in /var/log/bootstrap.log /var/log/dpkg.log /var/log/alternatives.log ; do
 					output_echo "Warning: modifying $TOOL result, deleting unreproducible logfile $LOGFILE"
 					sudo rm -rf --one-file-system $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}/$LOGFILE
 				done
+				for FILE in /etc/machine-id /var/cache/ldconfig/aux-cache ; do
+					output_echo "Warning: modifying $TOOL result, deleting unreproducible file $FILE because it will be created as needed"
+					sudo rm -rf --one-file-system $BUILDDIR/$SUBDIR/${TOOL}/${SUITE}/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}
 				;;



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/4bdda15e0959be91298b3b17f6e0819d83f0fd4f

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/4bdda15e0959be91298b3b17f6e0819d83f0fd4f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20220829/1dafa31b/attachment-0001.htm>