Commit Graph

41 Commits

Author SHA1 Message Date
Raphaël Hertzog 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
Raphaël Hertzog 7b28512cf9 Don't try to copy sbm on etch CD images as it got removed. 2008-11-07 15:53:36 +00:00
Steve McIntyre 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
Joey Hess 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
Joey Hess f47d23be43 * Temporarily disable use of 64 bit detection due to syslinx's bug #410729. 2007-02-13 01:14:35 +00:00
Joey Hess 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
Steve McIntyre 4a2a622525 Make the boot scripts more consistent in how they call add_mkisofs_opt 2006-12-21 16:05:32 +00:00
Steve McIntyre 634682f779 Fixing oversights from the big merge 2006-12-07 23:51:14 +00:00
Steve McIntyre 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
Steve McIntyre 9b44f8f3e0 Fix f1.txt mods - only apply on CD1 2006-11-27 09:36:49 +00:00
Steve McIntyre 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
Steve McIntyre 89235c1124 Try again for dates 2006-11-26 22:53:28 +00:00
Steve McIntyre 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
Frans Pop 9924a80b78 * Include floppy disk images again for i386. 2006-11-23 00:42:39 +00:00
Steve McIntyre 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
Steve McIntyre 5a80e07493 * Fix KERNEL_PARAM breakage. Thanks to Vagrant Cascadian for the patch,
closes: #387255
2006-10-08 11:25:42 +00:00
Petter Reinholdtsen 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
Joey Hess 4110d78b3e move an echo around 2006-08-24 18:52:10 +00:00
Frans Pop 73f2664cec Disable el-torito boot image for i386 2006-07-30 13:00:57 +00:00
Frans Pop 2e0f6ffcca Exclude floppy and el-torito images for i386 as they are not being built 2006-07-29 21:09:05 +00:00
Frans Pop 45ac515723 Give daily builds for i386 back to Joey 2006-07-23 17:38:16 +00:00
Frans Pop d9d9e45386 Temporarily take over i386 daily builds 2006-07-17 09:29:14 +00:00
Steve McIntyre 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
Joey Hess 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
Joey Hess 9ce8394fb7 fix copying of image to cd 2006-05-15 22:04:18 +00:00
Joey Hess 0bcfa7bdad remove remaining with* files always 2006-05-15 22:00:57 +00:00
Joey Hess 88c8591c95 typo 2006-05-15 00:53:46 +00:00
Joey Hess 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
Steve McIntyre 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
Frans Pop d015fe8754 Revert i386 takeover - Joey is back 2006-04-22 23:59:26 +00:00
Frans Pop c52a1e5ec6 Temporarily take over daily builds for i386 from Joey 2006-04-22 02:17:42 +00:00
Joey Hess 7980cf50a4 * Remove net-drivers floppy from full CD images. 2006-03-08 18:02:33 +00:00
Joey Hess 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
Steve McIntyre 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
Frans Pop ab9a1f6db4 Problem analyzed, so debugging no longer needed 2005-10-31 16:22:02 +00:00
Frans Pop b7c085427d Debug why daily m68k builds are not build from smarenka's home; will revert tomorrow 2005-10-31 15:50:25 +00:00
Joey Hess 2d7658bac7 - Use isolinux config files included in the d-i debian-cd_info tarball
so it does not need to be maintained in both places.
2005-07-08 09:22:27 +00:00
Joey Hess 73a4345271 - Completed access cd-drivers transition.
- d-i renamed syslinux.txt to boot.txt, us new name instead of
      renaming file from d-i.
2005-07-08 08:07:22 +00:00
Santiago Garcia Mantinan d3ab791cdb Port to etch previous changes I commited for sarge. 2005-05-17 16:08:15 +00:00
Joey Hess 15be267e26 - Add support for f4.txt that is for systems with the 2.6 kernel. 2005-05-06 18:47:45 +00:00
Joey Hess 14988d1047 Add etch stuff. Mostly copied unchanged from sarge, with light edits.
Only enable the rescue isolinux targets for etch.

I hope at least some of the etch stuff (like tools/boot/etch) can be used
for the daily CD builds that build using d-i daily builds.
2005-05-05 16:15:44 +00:00