[rb-general] Bug#926242: jenkins.debian.org: Please test reproducibility status of Debian Installer images

[Chris Lamb]

[adding rb-general at lists.reproducible-builds.org to CC]

Hi Colin,

> This is all from dubious memory, but I suspect my setup at the time was
> roughly an amd64 system with:
> 
>   deb [arch=amd64] <local partial mirror>
>   deb <official mirror>
> 
> ... on the grounds that my local partial mirror didn't have space for
> both amd64 and i386.

Apologies for the delay in getting back to you all here.

I've got this working locally here although we require the following
change to the gen-sources.list.udeb script. Basically, we need print
three columns if we have "[options]", otherwise we just print two:

diff --git a/build/util/gen-sources.list.udeb b/build/util/gen-sources.list.udeb
index 539345a45..ac416266a 100755
--- a/build/util/gen-sources.list.udeb
+++ b/build/util/gen-sources.list.udeb
@@ -36,10 +36,9 @@ get_mirrors() {
 		[ -s $file ] || continue
 		grep '^deb[[:space:]]' $file | \
 		   grep -v '^deb[[:space:]]\+cdrom:' | \
-		   sed 's,^deb \[[^]]*\] ,deb ,' | \
 		   grep -v '\(security.debian.org\|volatile.debian.\(net\|org\)\)' | \
 		   grep '[[:space:]]main' | \
-		   awk '{print $1 " " $2}' | \
+		   awk '{ print (substr($2, 0, 1) == "[") ? $1 " " $2 " " $3 : $1 " " $2 }' | \
 		   sed 's,^deb file,deb copy,' | \
 		   sed 's,/* *$,,'
 	done

How does this look to you? Shell "golf" suggestions welcome,
naturally. (I tried a few sed variants but it got a bit messy.)


Best wishes,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      lamby at debian.org 🍥 chris-lamb.co.uk
       `-