Bug#612224: debian-cd: Squeeze CDs include tools/win32-loader/unstable/win32-loader.exe (and other suites)
Package: debian-cd
Version: 3.1.5
Severity: important
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
thanks to recent changes in dak, the win32-loader package has the ability to
upload byhand files which land in tools/win32-loader/$(SUITE)/ on the Debian
mirrors (with $SUITE being {stable,testing,unstable}).
It appears that the complete tools/ directory is copied on the x86 CDs, which
already includes win32-loader.exe in another form.
So what we have now is:
$ lesspipe debian-6.0.0-amd64-netinst.iso | grep .exe$
/setup.exe
/tools/loadlin.exe
/tools/win32-loader/testing/win32-loader.exe
/tools/win32-loader/unstable/win32-loader.exe
(Current 6.0.0 CDs lack the …/stable/… version as they have been built before
the win32-loader.exe file had been copied from testing to stable during the
release process.)
setup.exe is win32-loader.exe in its "CD flavour", where the win32-loader.exe
under the tools/ directory on both CDs and mirrors are win32-loader.exe in its
"standalone flavour" (which permits the download of kernels and initrd's from
internet), hence not of real use on CD's.
A proposed patch is attached (with twice the same information as
tools/boot/{sid,squeeze} are symlinks in the debian-cd version in current
stable.)
Thanks in advance for considering this for 6.0.* .
Cheers,
OdyX
- -- System Information:
Debian Release: 6.0
APT prefers unstable
APT policy: (750, 'unstable'), (700, 'testing-proposed-updates'), (700, 'testing'), (101, 'testing-proposed-updates'), (101, 'experimental'), (101, 'unstable'), (101, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.37-trunk-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_CH.UTF-8, LC_CTYPE=fr_CH.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iJwEAQECAAYFAk1PGNMACgkQKA1Vt+jBwDgXNgP+KXVF1NLJRWDR7t2M+lospVfR
wTTIfhbS6DodWAHG3Tzr7wNOKvN1r/0dXCFVjcZO0dBkxBN4xmtf1aUDTnbMmUhx
q171uOOU4r8JJv+htz8qi5Tn1qs5iva+wWzcJ1Kjhsb4KqTcPR30+oIgKQXw9CMa
PjqO5/35oa1ms7VMnkk=
=Xw0O
-----END PGP SIGNATURE-----
diff -Nru debian-cd-3.1.5/debian/changelog debian-cd-3.1.5+squeeze1/debian/changelog
--- debian-cd-3.1.5/debian/changelog 2011-02-03 00:50:34.000000000 +0100
+++ debian-cd-3.1.5+squeeze1/debian/changelog 2011-02-06 22:47:42.000000000 +0100
@@ -1,3 +1,9 @@
+debian-cd (3.1.5+squeeze1) UNRELEASED; urgency=low
+
+ * Remove win32-loader standalone flavours from the tools/ directory on x86.
+
+ -- Didier Raboud <odyx@debian.org> Sun, 06 Feb 2011 21:36:36 +0100
+
debian-cd (3.1.5) unstable; urgency=high
[ Steve McIntyre ]
diff -Nru debian-cd-3.1.5/tools/boot/sid/boot-x86 debian-cd-3.1.5+squeeze1/tools/boot/sid/boot-x86
--- debian-cd-3.1.5/tools/boot/sid/boot-x86 2010-12-26 20:24:30.000000000 +0100
+++ debian-cd-3.1.5+squeeze1/tools/boot/sid/boot-x86 2011-02-06 21:36:20.000000000 +0100
@@ -123,6 +123,8 @@
[ "$OMIT_DOC_TOOLS" != "1" ] ; then
echo " Adding tools to CD1"
$BASEDIR/tools/add_files $CDDIR $MIRROR tools
+ # Remove the win32-loader/ subdirectory from tools, as d-i already installs setup.exe
+ rm -Rf $CDDIR/tools/win32-loader
fi
fi
diff -Nru debian-cd-3.1.5/tools/boot/squeeze/boot-x86 debian-cd-3.1.5+squeeze1/tools/boot/squeeze/boot-x86
--- debian-cd-3.1.5/tools/boot/squeeze/boot-x86 2010-12-26 20:24:30.000000000 +0100
+++ debian-cd-3.1.5+squeeze1/tools/boot/squeeze/boot-x86 2011-02-06 21:36:20.000000000 +0100
@@ -123,6 +123,8 @@
[ "$OMIT_DOC_TOOLS" != "1" ] ; then
echo " Adding tools to CD1"
$BASEDIR/tools/add_files $CDDIR $MIRROR tools
+ # Remove the win32-loader/ subdirectory from tools, as d-i already installs setup.exe
+ rm -Rf $CDDIR/tools/win32-loader
fi
fi
Reply to: