Bug#706150: marked as done (Build without isolinux/desktop)
Your message dated Tue, 14 Jan 2014 17:33:22 +0000
with message-id <E1W37re-0004rT-9P@franck.debian.org>
and subject line Bug#706150: fixed in debian-cd 3.1.14
has caused the Debian Bug report #706150,
regarding Build without isolinux/desktop
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)
--
706150: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=706150
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: debian-cd
Version: 3.1.12
I'm building custom server install ISOs, installing a desktop is
unnecessary and unneeded. debian-cd currently expects there to always be
isolinux/desktop/* files and a dtmenu.cfg file, failing if they are missing.
The attached patch file makes it so debian-cd can cope whether those
files are present or not.
--
Robert Spencer
--- tools/boot/squeeze/boot-x86~ 2011-02-22 20:52:44.000000000 +0000
+++ tools/boot/squeeze/boot-x86 2013-04-25 12:50:20.000000000 +0000
@@ -269,17 +269,14 @@
if [ -z "$MULTIARCH" ]; then
# Set up isolinux dir for only the current arch
- sed -i "s|%install%|$INSTALLDIR|" \
- boot$N/isolinux/*.cfg boot$N/isolinux/desktop/*.cfg
+ grep -lr '%install%' boot$N/isolinux/* | xargs -r sed -i "s|%install%|$INSTALLDIR|"
# Remove the amd*.cfg files to avoid them being loaded on a
# disc that does not have both amd64 and i386 dirs.
- rm -f boot$N/isolinux/amd*.cfg boot$N/isolinux/desktop/amd*.cfg
+ find boot$N/isolinux/ -name "amd*.cfg" -delete
else
# Set up isolinux dir for multi-arch
- sed -i "s|%install%|$INSTALLDIR_i386|
- s|%install-amd%|$INSTALLDIR_amd64|" \
- boot$N/isolinux/*.cfg boot$N/isolinux/desktop/*.cfg
+ grep -lr '%install[-amd]*%' boot$N/isolinux/* | xargs -r sed -i -e "s|%install%|$INSTALLDIR_i386|" -e "s|%install-amd%|$INSTALLDIR_amd64|"
for file in boot$N/isolinux/f3.txt* boot$N/isolinux/f4.txt*; do
sed -i "4 s/^$/(note: i386 is default; prepend 'amd64-' to use an amd64 kernel instead)/" $file
--- tools/boot/squeeze/x86-desktop.sh~ 2009-05-31 23:53:55.000000000 +0000
+++ tools/boot/squeeze/x86-desktop.sh 2013-04-25 12:59:18.000000000 +0000
@@ -22,8 +22,10 @@
boot$N/isolinux/amdtxt.cfg || true
sed -i "/^include menu.cfg/ a\include instsel.cfg" \
boot$N/isolinux/prompt.cfg
- sed -i "/^default install/ a\include instsel.cfg" \
- boot$N/isolinux/desktop/prompt.cfg
+ if [ -e boot$N/isolinux/desktop/prompt.cfg ]; then
+ sed -i "/^default install/ a\include instsel.cfg" \
+ boot$N/isolinux/desktop/prompt.cfg
+ fi
cat >boot$N/isolinux/instsel.cfg <<EOF
default install-select
label install-select
@@ -48,8 +50,8 @@
modify_for_single_desktop() {
# Cleanup
- rm boot$N/isolinux/dtmenu.cfg
- rm -r boot$N/isolinux/desktop
+ rm -f boot$N/isolinux/dtmenu.cfg
+ rm -fr boot$N/isolinux/desktop
# Set default desktop, or remove if not applicable
if [ "$DESKTOP" ]; then
--- tools/boot/wheezy/boot-x86~ 2013-03-24 20:13:25.000000000 +0000
+++ tools/boot/wheezy/boot-x86 2013-04-25 12:00:42.000000000 +0000
@@ -284,17 +284,14 @@
if [ -z "$MULTIARCH" ]; then
# Set up isolinux dir for only the current arch
- sed -i "s|%install%|$INSTALLDIR|" \
- boot$N/isolinux/*.cfg boot$N/isolinux/desktop/*.cfg
+ grep -lr '%install%' boot$N/isolinux/* | xargs -r sed -i "s|%install%|$INSTALLDIR|"
# Remove the amd*.cfg files to avoid them being loaded on a
# disc that does not have both amd64 and i386 dirs.
- rm -f boot$N/isolinux/amd*.cfg boot$N/isolinux/desktop/amd*.cfg
+ find boot$N/isolinux/ -name "amd*.cfg" -delete
else
# Set up isolinux dir for multi-arch
- sed -i "s|%install%|$INSTALLDIR_i386|
- s|%install-amd%|$INSTALLDIR_amd64|" \
- boot$N/isolinux/*.cfg boot$N/isolinux/desktop/*.cfg
+ grep -lr '%install[-amd]*%' boot$N/isolinux/* | xargs -r sed -i -e "s|%install%|$INSTALLDIR_i386|" -e "s|%install-amd%|$INSTALLDIR_amd64|"
for file in boot$N/isolinux/f3.txt* boot$N/isolinux/f4.txt*; do
sed -i "4 s/^$/(note: i386 is default; prepend 'amd64-' to use an amd64 kernel instead)/" $file
--- tools/boot/wheezy/x86-desktop.sh~ 2009-05-31 23:53:55.000000000 +0000
+++ tools/boot/wheezy/x86-desktop.sh 2013-04-25 11:54:58.000000000 +0000
@@ -22,8 +22,10 @@
boot$N/isolinux/amdtxt.cfg || true
sed -i "/^include menu.cfg/ a\include instsel.cfg" \
boot$N/isolinux/prompt.cfg
- sed -i "/^default install/ a\include instsel.cfg" \
- boot$N/isolinux/desktop/prompt.cfg
+ if [ -e boot$N/isolinux/desktop/prompt.cfg ]; then
+ sed -i "/^default install/ a\include instsel.cfg" \
+ boot$N/isolinux/desktop/prompt.cfg
+ fi
cat >boot$N/isolinux/instsel.cfg <<EOF
default install-select
label install-select
@@ -48,8 +50,8 @@
modify_for_single_desktop() {
# Cleanup
- rm boot$N/isolinux/dtmenu.cfg
- rm -r boot$N/isolinux/desktop
+ rm -f boot$N/isolinux/dtmenu.cfg
+ rm -fr boot$N/isolinux/desktop
# Set default desktop, or remove if not applicable
if [ "$DESKTOP" ]; then
--- End Message ---
--- Begin Message ---
Source: debian-cd
Source-Version: 3.1.14
We believe that the bug you reported is fixed in the latest version of
debian-cd, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 706150@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Steve McIntyre <93sam@debian.org> (supplier of updated debian-cd package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Tue, 14 Jan 2014 17:19:22 +0100
Source: debian-cd
Binary: debian-cd
Architecture: source all
Version: 3.1.14
Distribution: unstable
Urgency: medium
Maintainer: Debian CD Group <debian-cd@lists.debian.org>
Changed-By: Steve McIntyre <93sam@debian.org>
Description:
debian-cd - Tools for building (Official) Debian CD set
Closes: 706150 706156
Changes:
debian-cd (3.1.14) unstable; urgency=medium
.
[ Steve McIntyre ]
* Start jessie work; copy things from the wheezy config for now.
* Remove older squeeze, lenny, etch dirs
* Move code hosting from svn to git.
* Make sure that when we call apt, we tell it to *not* use localised
package descriptions; this causes issues during build. See #712435 in
apt.
* List Translation files in dists/$dist/Release too - apt looks there
now instead of in Index, apparently.
* Remove mention/support of the s390(x) tape options; not created by d-i
any more, and this is causing build failures.
* Remove mention/support of old kfreebsd 8 kernels - they are not
created any more, and this is causing build failures.
* Remove s390 from the arch lists in various scripts, as it's going
away. Support remains if specifically configured yet.
* tools/update_tasks: don't hard-code the default desktop to use,
instead work it out directly from the dependencies of the task-desktop
package.
* tools/boot/jessie/*: Pull out some more common code into common.sh to
simplify the various boot-$arch scripts. Warn about potentially
insecure download locations.
.
[ Robert Spencer ]
* Build without isolinux/desktop. Closes: #706150
* Don't assume loadlin.exe exists. Closes: #706156
.
[ Joey Hess ]
* Add make and gcc back to forcecd1, to allow building out of tree
kernel wifi modules. I removed this and more earlier while cleaning
out undocuented cruft.
(I have not added back module-assistant so far,
since it needs build-essential which would pull in additional
dependencies.)
Checksums-Sha1:
e3ffe8c040117c8e93f91de76d981a024302a5d5 1709 debian-cd_3.1.14.dsc
7c747ea6ded82262e5458364171f575f25cd542e 1021652 debian-cd_3.1.14.tar.gz
d8f9c59aa4e43986f29603514369e686045d4b39 702778 debian-cd_3.1.14_all.deb
Checksums-Sha256:
efddf3c52a04d5e062eec0d9151b64625fb7348d6abf424e45e49718ef03a1e6 1709 debian-cd_3.1.14.dsc
b201a4e162ae510a7bd50f1d2f5769b158624341b543adf80963d254950660c8 1021652 debian-cd_3.1.14.tar.gz
2c2554d87e791fa141cd165713f5838eaef2e233c8e4d821443c6148a1d3dc58 702778 debian-cd_3.1.14_all.deb
Files:
d9cc4b8a2fd6993b8291bae000604fc1 1709 admin extra debian-cd_3.1.14.dsc
b347822aa6c27b73de4fb56f7aaf4681 1021652 admin extra debian-cd_3.1.14.tar.gz
e1e71357a0c25b6c33975f3b9c5d5665 702778 admin extra debian-cd_3.1.14_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAEBCAAGBQJS1XMQAAoJEFh5eVc0QmhO79cQAIlYN/2ny24fDnDj9U2bOodj
R72CwW834OVulrmq0GZWo4oL7o4aKjW3A5Z2dw8UIxPEN01zaks1oEjA+Upc2Ix4
oFYPNkDcchQWZkyNfkWxeUyywa24Ct1Ti7aaHIomhrDpr3oKQTesoaETE3NKpNZP
X8G8o6j2LmHmyG/WkDUB0Hv9Oos5KZaS4xGTjHX0VRozqYW1ynIZgAkldKi6aMId
aTYIVxyhktnihSPY1nSp/vnAXxDs9tMg0NnjWPl7liWsSp0/1x1CXtASbPIOdwPu
7mJiA1/ugO+1h10RVvIInafoxkSzA+pQEbUUervLN5xZZ0W9T9WlBpWFqho9tYzt
2CjYwEM0COVHbWzOhIivMhB5TXEBmU337Dn2bcMuXo6WTN72TT+LQ6H9iCgkweyq
UPO6LB9/uxtlfF8jvaY1fcHQHXVCFK/H1iwsBwjAWvKcjuvPnFcZFwAMxYi5Exy9
545szAB/4I3DKOoSb8zR0s38VQ1oqLUzCkHS6KL/2fxNM/s5BXsPlX82GuOqBXlo
p/U9RKr1rosB4xtTOqXaGZXyDfpLH5f6qCfRPZ1GMX9k5yLzPlAVicBx/Ea9T4Wq
GhaHy2M1tbJgYxaIMgqjlwCUgAz52I+p+nN9wA7aICniWS4luiPcgbOt0xdTj3w7
cGTO4LJv+fjpVb7Vsv9r
=qg31
-----END PGP SIGNATURE-----
--- End Message ---
Reply to: