Re: Bug#926242: jenkins.debian.org: Please test reproducibility status of Debian Installer images
On Fri, May 24, 2019 at 06:56:35PM -0700, Vagrant Cascadian wrote:
> Colin Watson removed it back in 2011:
>
> https://salsa.debian.org/installer-team/debian-installer/commit/fa965c32ca8bfa2ff14886c6f0dca131532815c7
>
> commit fa965c32ca8bfa2ff14886c6f0dca131532815c7
> Author: Colin Watson <cjwatson@debian.org>
> Date: Mon Mar 14 18:08:25 2011 +0000
>
> Skip the option field in sources.list lines, if present.
>
> diff --git a/build/util/gen-sources.list.udeb b/build/util/gen-sources.list.udeb
> index e86b4fa66..9f140100e 100755
> --- a/build/util/gen-sources.list.udeb
> +++ b/build/util/gen-sources.list.udeb
> @@ -36,6 +36,7 @@ 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}' | \
>
>
> Happen to remember what it breaks to have these present? If it was a
> workaround, perhaps it is no longer needed?
I'm not certain even after going through my IRC and email logs around
that time, but given the timing I suspect that it was a workaround for
multiarch systems where sources.list contained some lines with
[arch=...] options to limit them to only some architectures. I don't
remember exactly how this broke the d-i build; I assume it must have
done at the time or I wouldn't have made that change.
It would be worth somebody trying out a d-i build on a system with this
kind of configuration to see if it still breaks, but otherwise I suspect
we can drop this.
--
Colin Watson [cjwatson@debian.org]
Reply to: