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

[Chris Lamb]

Cyril Brulebois wrote:

> I'm a little wary with possibly merging this late in the release cycle,
> so I'd rather get see that looked at after Buster is out.

I naturally understand your hesitation but on the other hand I would
truly love to see this in buster. Indeed, we may actually have done
enough work to boast about having reproducible installer images for
the upcoming release (!) although without testing on our more-
comprehensive testing framework it is difficult to tell at the
moment...

Devil's advocate: this is surely unlikely to break the release of
buster itself? I mean, for the "final" official buster builds, that is?

> With extra apologies since I've just broken the context of your patch
> by removing the volatile references

No problem, updated patch is:

commit c27a34ba97e028c5b57a35470f6ecb82ad1d9ffb
Author: Chris Lamb <lamby at debian.org>
Date:   Wed Jun 5 21:20:34 2019 +0100

    Include arguments from sources.list(5) such as [check-valid-until=no], etc. (Re: #926242)
    
    We print three columns if we have "[options]", otherwise we just print
    two as before.

diff --git a/build/util/gen-sources.list.udeb b/build/util/gen-sources.list.udeb
index 7fa40ac5a..f8415fb05 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' | \
 		   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


Best wishes,

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