Commit Graph

388 Commits

Author SHA1 Message Date
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
Steve McIntyre 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
Steve McIntyre ec87877896 Fix path for creating splash image in boot-amd64. Closes: #413850. 2007-03-12 01:33:39 +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
Steve McIntyre 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
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 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
Steve McIntyre 342bcac67b don't suggest binutils-multiarch, we haven't needed that for mipsel CDs since woody 2006-12-23 01:17:47 +00:00
Steve McIntyre 82aa893404 Minor update to boot-sparc 2006-12-22 14:24:28 +00:00
Steve McIntyre 5f185be61f Removed old "set -x" 2006-12-21 16:19:34 +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 67d9909bbe Make sure the mkisofs options file goes in the right place 2006-12-21 15:27:50 +00:00
Steve McIntyre 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
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
Frans Pop 5f62118c2c Daily builds for amd64 now done by Andreas Barth; with thanks to Kurt Roeckx 2006-12-07 01:01:01 +00:00
Colin Watson 7a843520eb * Include prep support on powerpc images again. 2006-12-04 10:30:40 +00:00
Steve McIntyre 3f2f6c11e3 Don't attempt to make ppc CDs bootable after #1 2006-11-27 09:43:10 +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 3e59b569ea Current values 2006-11-17 00:35:50 +00:00
Frans Pop 2a9dbeb4d8 * Include "tape" images again for S/390. 2006-11-02 07:21:58 +00:00
Steve McIntyre b5de101510 Current boot- sizes 2006-10-31 00:06:55 +00:00
Frans Pop ddf215a939 Also remove no longer needed boot parameters for hppa 2006-10-22 22:42:44 +00:00
Joey Hess de0e745535 * Increase alpha hardcoded ramdisk_size to 20 mb, 16 is too small now. 2006-10-22 22:23:56 +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
Petter Reinholdtsen 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
Steve McIntyre 5a80e07493 * Fix KERNEL_PARAM breakage. Thanks to Vagrant Cascadian for the patch,
closes: #387255
2006-10-08 11:25:42 +00:00
Colin Watson 277eecc730 * Remove init=/linuxrc from hppa. 2006-09-15 09:07:20 +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
Colin Watson 83af20b93f cope with powerpc cdrom -> cdrom64 change 2006-08-29 14:09:19 +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 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
Frans Pop 452b0ec0a6 There are no tape images with 2.6.16 for S/390 2006-07-29 19:11:12 +00:00
Steve McIntyre 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
Frans Pop 7bde597d14 Mips has dropped r5k-ip22 kernels and gained r5k-ip32 2006-07-28 21:18:49 +00:00
Frans Pop fa8a2837be Drop 2.4 support for sparc64; switch from 2.4 to 2.6 for sparc32 2006-07-27 10:25:48 +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
Steve McIntyre 22fbd311c0 Syncing changes back from the build machine 2006-07-03 14:00:34 +00:00
Steve McIntyre fd5997614f Sync some changes in from the build machine 2006-07-03 13:59:09 +00:00
Frans Pop f4277b2348 AMD64 d-i images are now available from people.d.o 2006-07-02 22:14:37 +00:00
Frans Pop ba45622865 Fix URL to powerpc images 2006-06-24 12:31:04 +00:00
Frans Pop 20434539ca Wouter Verhelst has taken over daily d-i builds for powerpc 2006-06-23 20:50:42 +00:00
Joey Hess 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
Joey Hess 99a1707eb8 * Correct url to the amd64 dailys. 2006-06-15 19:25:33 +00:00
Joey Hess 5c2d0ecb20 * d-i doesn't include bast images anymore, drop from boot-arm. 2006-05-24 18:03:47 +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
Joey Hess 9d6a6006e7 * ths has taken over mipsel builds 2006-05-10 20:08:42 +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
Colin Watson 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
Frans Pop e13e471f6d Thiemo Seufer has resumed building images for mips 2006-04-23 18:10:53 +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
Frans Pop 0596978928 Colin Watson has taken over daily d-i builds for PowerPC 2006-03-28 16:23:04 +00:00
Joey Hess 7980cf50a4 * Remove net-drivers floppy from full CD images. 2006-03-08 18:02:33 +00:00
Steve McIntyre 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
Frans Pop e365484e8b Kyle McMartin is now taking care of HPPA daily builds 2006-02-15 22:20:09 +00:00
Steve McIntyre 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
Frans Pop 3f38cc069c tbm has temporarily taken over daily mips builds from ths 2006-02-07 18:40:38 +00:00
Frans Pop 839d556954 arm: risc* flavours are no longer built; patch by Martin Michlmayr 2006-02-07 18:34:58 +00:00
Steve McIntyre 576e35c431 Add an initial copy of boot-amd64.calc for etch 2006-02-05 02:09:42 +00:00
Steve McIntyre f7a94acfc8 Cope with mipsel boot images moving location. Closes: #349563 2006-01-24 00:08:23 +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 5e5a31750c Set boot-s390 script executable 2005-12-15 22:24:34 +00:00
Steve McIntyre 70605c7b44 Fix the code to find the kernel(s) for HPPA; JTE wants the path
relative to the root of the CD, not the absolute path on the host
filesystem.
2005-12-08 01:33:17 +00:00
Steve McIntyre 2c24d679d4 Merging JTE support into the trunk now that the Debian mkisofs package
has JTE included by default.
2005-12-07 00:08:57 +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 a365d7c22b * Don't chmod amiboot if it doesn't exist. 2005-10-31 15:20:27 +00:00
Colin Watson f315aecc40 use $DI_CODENAME in boot-powerpc rather than hardcoding sarge/etch 2005-10-18 08:27:19 +00:00
Tollef Fog Heen d44ee5d938 Apply patch from Bdale to make CD building work correctly on HPPA. 2005-09-29 08:01:49 +00:00
Steve McIntyre 9fdb678d8b Copied Richard Hirst's hppa ramdisk size fix for sarge as well as etch 2005-09-26 21:25:25 +00:00
Joey Hess c2df2f7c1e - Fix ramdisk_size value for hppa 2005-09-21 07:32:45 +00:00
Sven Luther 3adf94038b Readded the bitness thingy, which got lost before i had svn access. 2005-09-20 17:26:10 +00:00
Sven Luther 5aaa17f9fc Better fix, which doesn't go over the net. 2005-09-20 15:10:06 +00:00
Sven Luther 25b483599a Now test not only if $DI_DIR is not empty, but also if it is a real dir.
This was not the case in the powerpc builds, and thus the build failed.
2005-09-20 14:55:36 +00:00
Sven Luther 75b9f25cc5 Added set -x to actually provide some visible info in the log about what is happening. Hopefully it will work this time. 2005-09-20 12:15:50 +00:00
Raphaël Hertzog 86b020552d Little fix committed for Sven Luther. 2005-09-19 14:12:28 +00:00
Joey Hess 46f282657d second half of sven's patch 2005-09-17 17:05:27 +00:00
Joey Hess fc0ae496b1 * Applied patch from Sven Luther which adds powerpc64 kernels to
the CDs, and adds IBM chrp boot files. Closes: #328274
* Remove Debian_sid task, which dates from before woody and should not be
  used.
2005-09-14 17:55:39 +00:00
Joey Hess 34df7ddf4e fix sid symlinks, and begin versioning in svn 2005-09-07 15:21:11 +00:00
Frans Pop 10f1ae01cc Update for Sparc:
- sparc64: switch to 2.6.12 kernel; make CD multiboot 2.6 and 2.4,
  using 2.6.12 by default
- sparc32: drop 2.6 kernel support as it has no 2.6.12 kernel
- restructure silo.conf with proper support for install, expert and
  rescue boot options
2005-09-05 21:05:05 +00:00
Joey Hess 2e38d856fa - Applied s390 boot support patch by Frans Pop. Closes: #318021 2005-08-08 17:51:56 +00:00
Joey Hess 97a1836833 - Switch mipsel to use my builds. 2005-08-04 05:54:00 +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 433894c716 please limit pointless debugging messages to English. :-P 2005-07-08 09:12:12 +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