[Git][qa/jenkins.debian.net][master] reproducible Debian: stop variying the build path, we want reproducible builds

[Holger Levsen (@holger)]

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


Commits:
8c2c7fb4 by Holger Levsen at 2023-08-29T10:27:09+02:00
reproducible Debian: stop variying the build path, we want reproducible builds

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

- - - - -


2 changed files:

- bin/reproducible_build.sh
- bin/reproducible_common.sh


Changes:

=====================================
bin/reproducible_build.sh
=====================================
@@ -625,12 +625,8 @@ export LANG="C.UTF-8"
 unset LC_ALL
 export LANGUAGE="en_US:en"
 EOF
-	# build path is only varied on unstable and experimental
-	if [ "${SUITE}" = "unstable" ] || [ "$SUITE" = "experimental" ]; then
-		echo "BUILDDIR=/build/1st" >> "$TMPCFG"
-	else
-		echo "BUILDDIR=/build/reproducible-path" >> "$TMPCFG"
-	fi
+	# build path not varied anymore
+	echo "BUILDDIR=/build/reproducible-path" >> "$TMPCFG"
 	if [ "$SRCPACKAGE" = "debian-installer" -o "$SRCPACKAGE" = "debian-installer-netboot-images" ] ; then
 		# d-i needs to access to a debian-archive.  this is not possible in
 		# pbuilder, so grant complete network access to it.
@@ -744,14 +740,8 @@ export LC_ALL="$locale.UTF-8"
 export LANGUAGE="$locale:$language"
 umask 0002
 EOF
-	# build path is only varied on unstable and experimental
-	if [ "${SUITE}" = "unstable" ] || [ "$SUITE" = "experimental" ]; then
-		local src_dir_name="$(perl -mDpkg::Source::Package -e '$_ = Dpkg::Source::Package->new(filename => $ARGV[0])->get_basename; s/_/-/g; print' -- "${SRCPACKAGE}_${EVERSION}.dsc")"
-		echo "BUILDDIR=/build/2/$src_dir_name" >> "$TMPCFG"
-		echo "BUILDSUBDIR=2nd" >> "$TMPCFG"
-	else
-		echo "BUILDDIR=/build/reproducible-path" >> "$TMPCFG"
-	fi
+	# build path is not varied anymore
+	echo "BUILDDIR=/build/reproducible-path" >> "$TMPCFG"
 	if [ "$SRCPACKAGE" = "debian-installer" -o "$SRCPACKAGE" = "debian-installer-netboot-images" ] ; then
 		# d-i needs to access to a debian-archive.  this is not possible in
 		# pbuilder, so grant complete network access to it.


=====================================
bin/reproducible_common.sh
=====================================
@@ -536,7 +536,7 @@ write_variation_table() {
 		write_page "<tr><td>gid</td><td>gid=1111</td><td>gid=2222</td></tr>"
 		write_page "<tr><td>/bin/sh</td><td>/bin/dash</td><td>/bin/bash</td></tr>"
 		write_page "<tr><td><em><a href=\"https://wiki.debian.org/UsrMerge\">usrmerge</a></em> package installed</td><td>no</td><td>yes <em>(not varied for buster/bullseye)</em></td></tr>"
-		write_page "<tr><td>build path</td><td>/build/1st/\$pkg-\$ver <em>(Only varied for unstable/experimental)</em></td><td>/build/2/\$pkg-\$ver/2nd <em>(Only varied for unstable/experimental)</em></td></tr>"
+		write_page "<tr><td>build path</td><td colspan=\"2\">/build/reproducible-path/\$pkg-\$ver <em>(not varied anymore)</em></td></tr>"
 		write_page "<tr><td>user's login shell</td><td>/bin/sh</td><td>/bin/bash</td></tr>"
 		write_page "<tr><td>user's <a href="https://en.wikipedia.org/wiki/Gecos_field">GECOS</a></td><td>first user,first room,first work-phone,first home-phone,first other</td><td>second user,second room,second work-phone,second home-phone,second other</td></tr>"
 		write_page "<tr><td>env DEB_BUILD_OPTIONS</td><td>DEB_BUILD_OPTIONS=\"parallel=XXX\"<br />  XXX on amd64: 16 or 15<br />  XXX on i386: 16 or 8<br />  XXX on armhf: 5 or 3</td><td>DEB_BUILD_OPTIONS=\"parallel=YYY\"<br />  YYY on amd64: 16 or 15 (!= the first build)<br />  YYY on i386: 15 or 7 (!= the first build)<br />  YYY is the same as XXX on arm64<br />  YYY on armhf: 2, 4, or 6</td></tr>"



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/8c2c7fb42d5ac6a554c67e01cc66c25971a9e078
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/20230829/87464a7c/attachment-0001.htm>