Commit 746ca36e authored by Holger Levsen's avatar Holger Levsen
Browse files

reproducible Debian: correctly document that we are not variying usrmerge (see... 


reproducible Debian: correctly document that we are not variying usrmerge (see below for explaination)

because:

- Debian is still not using usrmerge on buildds
- this is a noop-change for r-b
- I'd like the jenkins hosts not to reach unworking load levels. This seems to
  diffoscope related/caused, so I'm trying to reduce variations to get
  diffoscope not to act up and kill the host almost daily

Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent 8c2c7fb4

TODO.trixie

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


* things still to be done after the bookworm release and as trixie is open for development

** once these items have been done, move them down to "already done"

* update reproducible_common.sh with regards to the usrmerge variation in certain suites

* usrmerge (variation) is disabled everywhere, including on Debian buildds

* rename this file to TODO.forky

* enjoy

bin/reproducible_build.sh

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ EOF 


	local pbuilder_options=()

	#case "${SUITE}" in

	#	buster|bullseye)	;;

	#	buster|bullseye|bookworm)	;;

	#	*)			pbuilder_options+=(--extrapackages usrmerge)

	#				;;

	#esac

bin/reproducible_common.sh

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ write_variation_table() { 
		write_page "<tr><td>uid</td><td>uid=1111</td><td>uid=2222</td></tr>"

		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><em><a href=\"https://wiki.debian.org/UsrMerge\">usrmerge</a></em> package installed</td><td colspan=\"2\2>not not varied currently</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>"

hosts/common/etc/pbuilder/rebuild-hooks/A99_set_merged_usr

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


set -eu



# if [ "$DISTRIBUTION" != stretch ] && [ "$DISTRIBUTION" != buster ] && [ "$DISTRIBUTION" != bullseye ]; then

# if [ "$DISTRIBUTION" != buster ] && [ "$DISTRIBUTION" != bullseye ] && [ "$DISTRIBUTION" != trixie ]; then

#     echo "Re-configuring usrmerge..."



#     rm -fv /etc/unsupported-skip-usrmerge-conversion