132bae8583
Re-add the tools directory on amd64 and i386 disc #1
2009-02-14 12:16:11 +00:00
7f320fed82
x86-desktop.sh: improve comment
2009-01-30 05:00:20 +00:00
69e3f1fa76
Clean up D-I Lenny RC1 compatibility code
2009-01-30 05:00:16 +00:00
5032d25183
Drop support for ISOLINUX_DEFAULT
...
This environment variable was used by simple-cdd to force the default
installation option to the graphical installer. Now that we have the
syslinux VESA menu, the option has become rather pointless.
See #512303 for discussion.
2009-01-30 05:00:09 +00:00
33ec58d1a5
sparc: ensure the default 'install' option also gets KERNEL_PARAMS set
...
The current code will add KERNEL_PARAMS only for boot options that have
an existing "append=" line, but that leaves the default option without it.
2009-01-20 00:39:09 +00:00
dc3927d14c
Add support for a separate 'GNOME desktop environment' CD
...
This new task is mostly added for completeness. Main difference with
the default task file is that no server tasks are included.
2008-12-05 14:12:32 +00:00
31e8cfd687
Ensure working boot config for light/all desktops for arches other than x86
2008-12-05 14:12:26 +00:00
2225676ffe
Add support to create an 'all desktops' DVD
...
Include all four desktop environments supported by tasksel (GNOME, KDE,
LXDE and Xfce).
On x86 also add an option in the isolinux menu (under Advanced options)
to select which DE to install; GNOME remains default.
2008-12-05 14:12:24 +00:00
5b750a3810
Add support for a 'light desktop environment' CD (LXDE + Xfce)
...
Supports installation of either an xfce or an lxde desktop environment.
For now use B as identifier for INSTALLER_CD in contrib/testingcds.
Includes a framework to manipulate the isolinux configuration for x86 so
that a user can select which desktop he wishes to install.
2008-12-05 14:12:21 +00:00
3e2d5841be
Avoid build error when building full set of multi-arch i386/amd64 DVDs
2008-12-05 14:12:04 +00:00
c9c4150758
Don't add 'desktop=' to append line in instsel.cfg
2008-12-05 14:11:58 +00:00
5d95644996
boot-hppa: stop passing redundant boot parameters
...
With current initramfs support neither root= nor ramdisk_size= are
needed anymore.
2008-12-05 09:08:23 +00:00
ae69a5b14e
boot-hppa: support KERNEL_PARAMS
...
This is mainly to have the desktop= option passed correctly.
Also switch to space separation in -hppa-cmdline for consistency with
other architectures.
2008-12-05 09:08:20 +00:00
9ed57cc189
Fix x86 m-a breakage in workaround due to file renames
2008-11-26 12:46:58 +00:00
03adf99b41
Prepare for *text.cfg to *txt.cfg rename by D-I
2008-11-23 21:34:39 +00:00
4c0e41e465
* Add support for tracking which packages we've extracted binaries from,
...
so that we can archive them (both binaries and sources). If we need
anything, we will list it in CD$N.pkgs_extracted so that external
scripts can pick it up and do whatever's needed.
* Minor changes to the interface of tools/which_deb to accommodate that:
now just lists the files *within* the mirror; it's up to callers to
prepend ${MIRROR} as needed.
2008-11-23 18:19:25 +00:00
16f9407423
Prepare for adamd*.cfg to amdad*.cfg rename by D-I
2008-11-23 11:53:57 +00:00
bc419dbf37
Workaround issue with isolinux on amd64/i386 multi-arch images
...
Modify the syslinux configuration for amd64/i386 multi-arch images
and use ifcpu64.c32 to autodetect 32/64-bit systems when a user hits
enter from the isolinux help screens.
Based on research done and info provided by Franklin Piat.
2008-11-19 16:08:22 +00:00
262e02ffca
Fix i386/amd64 multi-arch support
...
Currently the isolinux configuration only gets created correctly if the
two arches are specified in the order "amd64 i386". Change the lenny x86
boot script so it works the other way around too.
2008-11-15 01:08:15 +00:00
a8f0d9d14b
Remove remaining remnants of pre-split-config support
2008-11-15 01:08:12 +00:00
88824982ba
Fix error in expansion of %ARCH% variables in D-I image location envvars
2008-11-14 20:14:35 +00:00
1a47dd2a93
Avoid adding an EOL at the end of f3/f4 syslinux help files
2008-11-13 00:23:16 +00:00
e37c9d5a1f
Indentation fix
2008-11-13 00:23:14 +00:00
5beea509c7
Improve code readability
2008-11-12 20:33:42 +00:00
747426afb6
More no longer needed compatibility code cleanup
2008-11-12 20:33:39 +00:00
bac7536f0f
Clean up no longer needed compatibility code in lenny x86 boot script
2008-11-12 18:06:29 +00:00
5aa7863d82
Also extract isolinux.bin from the syslinux package in the case of etch
...
CD images (since it's no more provided by debian-cd itself).
2008-11-07 16:32:06 +00:00
7b28512cf9
Don't try to copy sbm on etch CD images as it got removed.
2008-11-07 15:53:36 +00:00
bb9fad3216
Allow multi-arch builds using D-I images from official mirrors or local D-I images
...
This is made possible by allowing to include a "%ARCH%" placeholder in the
environment variables DI_WWW_HOME and DI_DIR which is expanded to the correct
value at runtime.
Supported for Etch and later.
2008-10-14 08:22:00 +00:00
07a91b45e3
Drop support for building Sarge CDs
2008-10-14 08:02:21 +00:00
45617b2d30
* Support KERNEL_PARAMS for powerpc, alpha and sparc ( Closes : #416230 )
...
Thanks to Vagrant Cascadian for the patch.
2008-10-12 23:30:19 +00:00
9202a3e6e8
Also remove advanced syslinux config files for gtk
...
Note that AFAICT removing these files is unnecessary as they should not
be included in the tarball if the file f3.txt.withgtk is not present.
2008-09-21 22:02:22 +00:00
1dd8261809
Update for syslinux config file rename in D-I
...
The files (ad)amd.cfg were renamed to (ad)amdtext.cfg for consistency.
2008-09-21 22:02:10 +00:00
704a350c35
Make sure directory to unpack syslinux in exists
...
Also make indentation consistent
2008-09-18 18:26:14 +00:00
3580191792
Remove all mention of sbm; no longer needed
2008-09-16 15:29:55 +00:00
60dbf627e2
* Major licensing problem cleanup: ( Closes : #497270 )
...
+ Remove binary blobs from the package; pull those files from the
.debs in the archive as needed (isolinux.bin, vesamenu.c32)
+ sbm.bin *not* yet worked out, so drop it for now
+ Pull out the code to find the right deb and put it in a new helper
shell script (tools/which_deb), called from Makefile and boot-* as
needed.
2008-09-15 23:09:18 +00:00
b598c30a47
* Add the "-joliet-long" option when making images with Joliet names.
...
Some packages with ridiculously long names are not unique in the
first 64 characters, so normal Joliet sorting fails.
2008-09-08 21:53:45 +00:00
b402ea3ba7
* Applied patch from Robert Millan <rmh@aybabtu.com> to allow choice of
...
desktop when building for win32-loader. Closes : #491300 .
2008-07-29 17:29:32 +00:00
787f433fe6
Correct location of images for ia64
2008-07-16 20:02:15 +00:00
311d0a1273
Daily builds for ia64 have moved
2008-07-16 20:02:11 +00:00
76dab60727
Daily builds for m68k have moved
2008-07-16 20:02:08 +00:00
b4fd0dfd9b
use isolinux rather than
2008-06-08 22:32:11 +00:00
55bd8d23b1
better anchor for search
2008-06-08 22:17:30 +00:00
83ac3d95a3
Add support for custom kernel params for all isolinux configurations
2008-06-08 22:13:42 +00:00
977746d1c1
Path to sparc daily builds has changed.
2008-06-05 22:45:11 +00:00
c580e320e8
Start to add armel support.
2008-05-04 17:38:52 +00:00
f91df1f669
Add support for a split syslinux.cfg file, which will later be provided
...
to support the syslinux vesa menu.
2008-05-01 20:52:03 +00:00
8ced9d59fc
Disable the other m68k option
2008-04-01 23:12:40 +00:00
5747f296cb
Temporarily disable boot support on problematic arches
2008-03-31 13:04:42 +00:00
5498cc1e5b
* Temporarily disable boot support for arm CDs - the netwinder images are not
...
being produced at the moment.
2008-03-05 00:14:25 +00:00
bd1da0c827
* boot-{mipsel,sparc}: Parse website directory index case insensitive so
...
that both "<a href=" and "<A HREF=" are recognized.
2007-12-12 00:45:02 +00:00
921d112d91
Try again to make lenny/sid i386 builds work again
2007-09-18 09:48:49 +00:00
c81d64da56
* Make daily i386/amd64 lenny builds work again - don't attempt to copy
...
the win32-loader files into place if they don't exist.
2007-09-17 10:52:03 +00:00
f2026f7c5f
* Fix autorun.inf generation when win32-loader is present.
2007-09-13 18:28:21 +00:00
8a0984b325
* Applied patch from Robert Millan <rmh@aybabtu.com> to use win32-loader
...
for autorun when CD is being used on Windows. Closes : #441846 .
2007-09-12 16:31:27 +00:00
23f2e94046
fix bashism
2007-09-10 18:10:16 +00:00
fbdb7b30fd
* Applied patch from Robert Millan <rmh@aybabtu.com> to integrate
...
win32-loader. Closes : #440220 .
2007-09-10 17:47:16 +00:00
08f297d554
* Disable debugging output in boot scripts.
2007-09-02 17:18:06 +00:00
2996bf0a1e
Invert the -e test
2007-08-11 23:23:25 +00:00
e53fc89e17
* Temporary fixup for daily lenny sparc builds - use older image locations
...
if new ones not available.
2007-08-11 12:57:12 +00:00
5655b191d5
Further logic fixing in boot-x86: amd64 should now work
2007-08-10 23:44:14 +00:00
c40e37b066
Fix boot-x86 shell syntax so it runs
2007-08-09 21:28:10 +00:00
6560eb096d
* Merge boot-i386 and boot-amd64 into boot-x86.
2007-08-02 03:47:50 +00:00
0b03aad504
* Parse isolinux.cfg case-insensatively.
2007-08-02 02:43:19 +00:00
cd50dfba26
* Drop old with26 cruft for lenny.
2007-08-02 02:28:02 +00:00
79c1614a0a
Use correct version of boot configuration files
2007-07-26 08:18:52 +00:00
7a414b8567
Partial reversion, we can always simplify further later
2007-07-26 01:53:36 +00:00
cb5987f544
- Remove support for sparc32
...
- Structure of D-I images was simplified, so adapt to that
- Fix some broken references to etch in lenny boot-sparc script
- Hope after all this things will still work...
2007-07-26 01:22:33 +00:00
ff146a5d79
Disable sparc32 for Lenny images as it is no longer supported
2007-07-18 07:39:59 +00:00
fdb006760d
Dann Frazier has taken over from Jeff Bailey for daily IA64 D-I builds
2007-05-03 22:00:21 +00:00
fff66f0336
- Also export COMPLETE for use in the README file template
...
- Clean up: remove files for potato and woody release
2007-04-10 23:31:01 +00:00
09e495846f
* Copied etch files to lenny ready for the new testing work.
2007-04-10 23:21:31 +00:00
64bd969a0c
* Fix up boot-alpha to calculate the size of the ramdisk needed, rather
...
than hard-coding to 16384. Also slight refactoring.
2007-03-20 01:01:16 +00:00
1fc78c6086
* Fix the extra_image() function in both boot-i386 and boot-amd64 to make
...
sure we don't end up overwriting extra images from one arch with those
from the other. Now the multi-arch netinst should work for the installgui
target for both arches
2007-03-13 02:21:13 +00:00
9006e6dd31
* Add the DEFAULT64 handling to boot-amd64 as well as boot-i386; needed
...
in both so that things are setup the same regardless of the order in
which the boot-$arch scripts are called
2007-03-13 01:06:07 +00:00
ec87877896
Fix path for creating splash image in boot-amd64. Closes : #413850 .
2007-03-12 01:33:39 +00:00
7b1b3973f8
* Updated isolinux.bin to the version from syslinux 3.31-3.
...
* Re-enable use of 64 bit detection, fixed now.
2007-03-01 19:18:45 +00:00
2ca98a7f32
* Cope with rolling back more than one package in case we go well
...
over the disc size
* Use a multiplier of 1.2 for HFS space - overkill, but it fixes
the multi-arch DVD overflowing. Also log if we're doing HFS.
* Tweak where we look for s390 boot files to make the weeklies work again.
2007-02-27 20:05:32 +00:00
f47d23be43
* Temporarily disable use of 64 bit detection due to syslinx's bug #410729 .
2007-02-13 01:14:35 +00:00
3d5259c5ef
* Use the 64 bit autodetection feature of syslinux 3.31-2, if available,
...
to default to the 64 bit target in multiarch isos.
2007-02-04 23:41:44 +00:00
528c0072f2
remove Suggests on delo - we grab and use the correct version direct
...
from the archive instead these days
2006-12-23 03:02:37 +00:00
342bcac67b
don't suggest binutils-multiarch, we haven't needed that for mipsel CDs since woody
2006-12-23 01:17:47 +00:00
82aa893404
Minor update to boot-sparc
2006-12-22 14:24:28 +00:00
5f185be61f
Removed old "set -x"
2006-12-21 16:19:34 +00:00
4a2a622525
Make the boot scripts more consistent in how they call add_mkisofs_opt
2006-12-21 16:05:32 +00:00
67d9909bbe
Make sure the mkisofs options file goes in the right place
2006-12-21 15:27:50 +00:00
95ffabb409
* Don't put ppc boot files on discs >1.
...
* Add more hfs options to m68k discs, to match ppc.
2006-12-12 02:09:34 +00:00
634682f779
Fixing oversights from the big merge
2006-12-07 23:51:14 +00:00
a269a8fd4c
Merge of changes from Steve's development branch to take us to
...
debian-cd version 3.0.0. Highlights:
* Support now added for multi-arch CDs/DVDs, including mixed
binary/source discs. Multi-arch discs should be bootable on those
multiple arches, modulo boot-sector clashes. Extra support added
in boot-i386 and boot-amd64 to make the 2 main arches happily
co-exist.
* Disc sizing is now much more intelligent - sizes are defined
depending on the disk type chosen at the start, and discs are now
filled exactly to those sizes while files are added rather than
the old up-front guessing method. Equally, the metadata on the
disc (Packages, Packages.gz, Sources, Sources.gz, md5sums.txt) is
generated as much as possible while this is happening to make the
sizing code incredibly accurate. Using this method of disc sizing
means that customising discs should be much easier/safer - either
add custom contents at the start and debian-cd will fill the
remainder of the disc, or afterwards roll back the packages on the
disc and add extras later.
* Source is now treated as (almost) just another arch, with most of
the special casing for source hidden internally. If asking for
source-only discs, they will simply be built using all the
available sources. If combined with other arches, the sources will
automatically be chosen to match the binary packages. Meeting GPL
requirements was never so easy!
* Removed lots of old cruft to clean up the codebase:
+ non-US support
+ woody support
+ lots of old support scripts that have been made redundant
+ significantly simpler Makefile, much easier to follow
+ old boot-$ARCH.calc files for estimating boot-file sizes are now
(obviously) obsolete and therefore gone
2006-12-07 23:09:01 +00:00
5f62118c2c
Daily builds for amd64 now done by Andreas Barth; with thanks to Kurt Roeckx
2006-12-07 01:01:01 +00:00
7a843520eb
* Include prep support on powerpc images again.
2006-12-04 10:30:40 +00:00
3f2f6c11e3
Don't attempt to make ppc CDs bootable after #1
2006-11-27 09:43:10 +00:00
9b44f8f3e0
Fix f1.txt mods - only apply on CD1
2006-11-27 09:36:49 +00:00
38aa21763a
* DEVEL BRANCH MERGE: Change mkisofs_opts usage: add a shell function
...
for the boot-$arch scripts to use rather than simply appending to the
$N.mkisofs_opts file directly. Needed for forthcoming multi-arch
support.
2006-11-27 02:15:29 +00:00
89235c1124
Try again for dates
2006-11-26 22:53:28 +00:00
6f101339c8
Add the build date/time into a few more places so people can see them
...
more easily; add the build time into the .disk/info file.
2006-11-26 22:42:02 +00:00
9924a80b78
* Include floppy disk images again for i386.
2006-11-23 00:42:39 +00:00
3e59b569ea
Current values
2006-11-17 00:35:50 +00:00
2a9dbeb4d8
* Include "tape" images again for S/390.
2006-11-02 07:21:58 +00:00
b5de101510
Current boot- sizes
2006-10-31 00:06:55 +00:00
ddf215a939
Also remove no longer needed boot parameters for hppa
2006-10-22 22:42:44 +00:00
de0e745535
* Increase alpha hardcoded ramdisk_size to 20 mb, 16 is too small now.
2006-10-22 22:23:56 +00:00
4a6935c1d3
* Merge patch from Petter to allow override of the default boot choice
...
in syslinux using the ISOLINUX_DEFAULT config option. Closes : #393229
2006-10-18 20:47:32 +00:00
99ca059cfa
[ Petter Reinholdtsen ]
...
* Update tools/boot/*/boot-amd64 to use the correct isolinux
splash image settings, and to insert $KERNEL_PARAMS correctly into
isolinux.cfg. Based on patches already implemented in boot-i386.
2006-10-15 16:44:41 +00:00
5a80e07493
* Fix KERNEL_PARAM breakage. Thanks to Vagrant Cascadian for the patch,
...
closes : #387255
2006-10-08 11:25:42 +00:00
277eecc730
* Remove init=/linuxrc from hppa.
2006-09-15 09:07:20 +00:00
758e9dc0bb
* Correct splash screen generation for sarge and etch, making sure the
...
correct background colour (black) is selected.
2006-09-02 10:56:44 +00:00
83af20b93f
cope with powerpc cdrom -> cdrom64 change
2006-08-29 14:09:19 +00:00
4110d78b3e
move an echo around
2006-08-24 18:52:10 +00:00
73f2664cec
Disable el-torito boot image for i386
2006-07-30 13:00:57 +00:00
2e0f6ffcca
Exclude floppy and el-torito images for i386 as they are not being built
2006-07-29 21:09:05 +00:00
7c7e23faf9
Make sure that we also actually take 2.6 kernel images if DI_DIR is set
2006-07-29 20:03:50 +00:00
452b0ec0a6
There are no tape images with 2.6.16 for S/390
2006-07-29 19:11:12 +00:00
ed1abc0ee4
* Mips has dropped r5k-ip22 kernels and gained r5k-ip32. And r5k-ip32
...
doesn't have CD boot support yet, so don't attempt to use the cdrom
boot image.
2006-07-28 22:35:14 +00:00
7bde597d14
Mips has dropped r5k-ip22 kernels and gained r5k-ip32
2006-07-28 21:18:49 +00:00
fa8a2837be
Drop 2.4 support for sparc64; switch from 2.4 to 2.6 for sparc32
2006-07-27 10:25:48 +00:00
45ac515723
Give daily builds for i386 back to Joey
2006-07-23 17:38:16 +00:00
d9d9e45386
Temporarily take over i386 daily builds
2006-07-17 09:29:14 +00:00
c48ee7153e
Add debug output to help work out which images we're using
...
Fix boot-amd64 to find the daily image files correctly
2006-07-03 14:39:16 +00:00
22fbd311c0
Syncing changes back from the build machine
2006-07-03 14:00:34 +00:00
fd5997614f
Sync some changes in from the build machine
2006-07-03 13:59:09 +00:00
f4277b2348
AMD64 d-i images are now available from people.d.o
2006-07-02 22:14:37 +00:00
ba45622865
Fix URL to powerpc images
2006-06-24 12:31:04 +00:00
20434539ca
Wouter Verhelst has taken over daily d-i builds for powerpc
2006-06-23 20:50:42 +00:00
a36572ee9e
* Add gtk initrd to amd64 images if available.
...
* Add autorun file to amd64 images if there's a README.html, same as for
i386.
2006-06-15 19:39:41 +00:00
99a1707eb8
* Correct url to the amd64 dailys.
2006-06-15 19:25:33 +00:00
5c2d0ecb20
* d-i doesn't include bast images anymore, drop from boot-arm.
2006-05-24 18:03:47 +00:00
43ff633c0e
* i386 has stopped building because the el-torito boot images were turned
...
off (due to size issues). Fix this by not failing if the el-torito images
arn't there.
2006-05-24 18:00:58 +00:00
9ce8394fb7
fix copying of image to cd
2006-05-15 22:04:18 +00:00
0bcfa7bdad
remove remaining with* files always
2006-05-15 22:00:57 +00:00
88c8591c95
typo
2006-05-15 00:53:46 +00:00
cbd40e680e
* Add support to boot/etch/boot-i386 for adding gtk images. If the
...
isolinux files include .with26+gtk, include gtk initrd along with the
2.4 kernel. If .withgtk, include gtk initrd along with the default
(presumably 2.6) kernel.
untested!!
2006-05-14 17:27:44 +00:00
9d6a6006e7
* ths has taken over mipsel builds
2006-05-10 20:08:42 +00:00
78966b6bde
* Fix to tools/grab_md5: reset the file and dir name after each source
...
package is finished with.
* Add extra debug in tools/boot/etch/boot-i386
2006-05-02 21:52:05 +00:00
c017d3cf55
* Only tell mkisofs to use the prep initrd if it's available (which it
...
currently isn't for 2.6.16).
2006-04-27 14:05:22 +00:00
e13e471f6d
Thiemo Seufer has resumed building images for mips
2006-04-23 18:10:53 +00:00
d015fe8754
Revert i386 takeover - Joey is back
2006-04-22 23:59:26 +00:00
c52a1e5ec6
Temporarily take over daily builds for i386 from Joey
2006-04-22 02:17:42 +00:00
0596978928
Colin Watson has taken over daily d-i builds for PowerPC
2006-03-28 16:23:04 +00:00
7980cf50a4
* Remove net-drivers floppy from full CD images.
2006-03-08 18:02:33 +00:00
d056a7b6e5
Mipsel boot images haven't actually moved yet in etch. Cope with this
...
- fall back to the old location if the new one isn't there.
2006-02-28 01:23:18 +00:00
e365484e8b
Kyle McMartin is now taking care of HPPA daily builds
2006-02-15 22:20:09 +00:00
b9ee14bddd
Update the boot-sparc scripts to improve the algorithm for finding the
...
right version of silo to use - grab the filename from the appropriate
Packages file rather than looking in the silo directory in the pool.
2006-02-12 20:53:25 +00:00
3f38cc069c
tbm has temporarily taken over daily mips builds from ths
2006-02-07 18:40:38 +00:00
839d556954
arm: risc* flavours are no longer built; patch by Martin Michlmayr
2006-02-07 18:34:58 +00:00
576e35c431
Add an initial copy of boot-amd64.calc for etch
2006-02-05 02:09:42 +00:00
f7a94acfc8
Cope with mipsel boot images moving location. Closes : #349563
2006-01-24 00:08:23 +00:00
a408da1a54
* Drop floppies from i386 netinst and businesscard; this will make the
...
netinst small enough to fit on 128 mb usb keychains again.
2005-12-28 18:07:01 +00:00
b9dab72c03
Use "|" rather than "/" as a sed separator in the etch boot-amd64 and
...
boot-i386 scripts. Closes : #342344
2005-12-17 17:53:52 +00:00
5e5a31750c
Set boot-s390 script executable
2005-12-15 22:24:34 +00:00
Steve McIntyre
Frans Pop
Raphaël Hertzog
cd-builder user
Joey Hess
Santiago Garcia Mantinan
Otavio Salvador
Colin Watson
Petter Reinholdtsen