Commit Graph

665 Commits

Author SHA1 Message Date
Steve McIntyre 0d3c11551e * It seems the changes for 3.0.0 completely broke extranonfree
support. Re-add it.
2007-04-19 23:38:29 +00:00
Frans Pop 4a72ff11a1 Oops, these changes were not committed at all; and there I was blaming Steve for my mistake while that was only one line against my five 2007-04-10 23:59:06 +00:00
Steve McIntyre 9fa84ca744 Updated comments in update-cd; potato was a while ago! 2007-04-10 23:46:26 +00:00
Steve McIntyre 8a277132e8 * Removed m68k from the list of arches in generate_di+k_list and
generate_di_list to reduce warnings.
2007-04-10 23:44:56 +00:00
Frans Pop 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
Steve McIntyre 09e495846f * Copied etch files to lenny ready for the new testing work. 2007-04-10 23:21:31 +00:00
Frans Pop df246f23a8 Fix minor errors in changelog 2007-04-07 22:51:43 +00:00
Steve McIntyre fa2c4bcc52 * Add some munging on the Release files if we're not building
for "testing". Used in the etch release, and I'll back it out shortly.
2007-04-07 11:34:51 +00:00
Steve McIntyre ab7e1d0171 In list2cds, don't add udebs in the final COMPLETE run - they're no
use there.
2007-04-06 18:23:14 +00:00
Steve McIntyre b695b182c4 * In start_new_disc, cope with $DEBVERSION containing spaces
* Only put the release notes and installation guide on disc#1
2007-04-04 16:40:18 +00:00
Steve McIntyre 45d56341c0 Go for new upload 2007-03-28 21:58:52 +00:00
Frans Pop 2be3b9f938 Add bug closure 2007-03-28 21:55:39 +00:00
Frans Pop bafda4ce02 * Add initrd-tools to forcd1 as it is needed for Sarge to Etch upgrades. 2007-03-28 21:31:48 +00:00
Steve McIntyre 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
Steve McIntyre 43d4a7d96a * Fix up the Debian_etch, Debian_etch-kde and Debian_etch-xfce
to use debian-installer+kernel-etch rather than -sid
2007-03-19 01:44:19 +00:00
Steve McIntyre 3484e93314 * Other small wording changes and fixes in the README file 2007-03-18 22:49:30 +00:00
Steve McIntyre cf6994ed78 * Remove mention of m68k in data/etc/README.html.in 2007-03-18 22:10:44 +00:00
Steve McIntyre a2d50b9f65 * Fix a silly bug in start_new_disc that would break on discs with
local packages. Thanks to Ronny Aasen for the patch. Closes: #414818
  * Final *final* upload for etch; urgency high to get through the
    freeze.
2007-03-13 23:38:53 +00:00
Steve McIntyre ebfad35c3a Check in current working versions of the tasks files 2007-03-13 02:35:38 +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
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
Frans Pop cee637fdd9 Add kernel-package too 2007-03-10 21:41:27 +00:00
Frans Pop 279dd3bafd * forcd1-etch: remove network-console-config; add module-assistant. 2007-03-10 21:31:38 +00:00
Raphaël Hertzog 46369d0dc5 Disable pattern metacharacters in some regex with included variables.
Closes: #413506
2007-03-05 16:09:46 +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
Raphaël Hertzog a2d9587f1a Don't rely on PATH containing the tools directory. 2007-02-21 14:13:35 +00:00
Steve McIntyre fe17c12b1a update-cd updates 2007-02-20 23:06:49 +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 80a037fb83 * Updated isolinux.bin to the version from syslinux 3.31-2. 2007-02-10 04:45:22 +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
Joey Hess 0a07bb9fdc * Updated tasks for tasksel 2.66. 2007-01-27 18:33:43 +00:00
Steve McIntyre 88c7b08fd7 Improve commenting around INSTALLER_CD option 2007-01-24 14:46:16 +00:00
Frans Pop f245fa4115 * Remove SRCEXCLUDE which is no longer supported. 2007-01-18 23:32:23 +00:00
Joey Hess 461e117d35 whitespace 2007-01-18 14:57:02 +00:00
Steve McIntyre 717c7d601d Typo in bug # 2007-01-14 16:32:46 +00:00
Steve McIntyre 4d4b845069 Gah, fix email address 2007-01-14 16:19:55 +00:00
Steve McIntyre f561cf201d Update changelog ready for a package upload 2007-01-14 15:44:46 +00:00
Steve McIntyre 66c1029d7c Note fix for #406320; the actual change went in *ages* ago. 2007-01-10 13:32:12 +00:00
Joey Hess 6d2b7e578e * Moved interesting-fromcd23 down to come after software from tasks in
priority.
2007-01-06 02:06:56 +00:00
Frans Pop 0916c1be82 Envvar NOSOURCE was obsoleted; minor whitespace cleanup 2007-01-05 06:49:52 +00:00
Steve McIntyre df2129f7e1 * Cleanup of Etch version of REAMDE.html.in - use "disc" or "CD/DVD" rather
than "CD" in many places.
2007-01-02 01:59:52 +00:00
Steve McIntyre ba8e154a12 * In start_new_disc, make sure that we call the (badly-named) add-bin-doc
so that we get README.html and README.txt created even for source discs.
2007-01-02 01:56:44 +00:00
Steve McIntyre 55f4db876a + Slightly change the output naming of the disc images to make it safer
to produce more then one type of multi-arch disc
2006-12-30 15:13:07 +00:00
Joey Hess c7ece8748b * Added an update-tasks target to the Makefile and moved the code out of
file header comments to there. Fix some bugs in passing.
* List packages for the various specific desktop tasks ahead of the non-key
  packages for the general desktop task. Along with changes in tasksel 2.60
  this should lead to a generally more useful set of packages on the desktop
  CDs; instead of filling up with OOo, it will fill up with things specific
  to the desktop environment.
* Updated task lists.
2006-12-29 06:05:30 +00:00
Steve McIntyre d53fd344a7 Update CONF.sh, better commenting for EXCLUDE syntax 2006-12-29 05:59:45 +00:00
Steve McIntyre 17bb18194f * Re-implemented exclude/unexclude support in make_disc_trees.pl instead
of in list2cds. Slight changes in semantics - the new code supports
    regular expressions for matching package names (to make it easier to
    exclude groups of related packages), and EXCLUDE<m> should be used in
    preference to EXCLUDE for packages that are just being shifted to
    later in the set by using UNEXCLUDE<n>.
2006-12-29 05:56:43 +00:00
Frans Pop 199e79c6f8 Create a new tasks/forcd1-etch file and remove old cruft 2006-12-29 03:13:06 +00:00
Steve McIntyre 35743cde5f As a last-minute step before building images, fill in the TOTALNUM
value in the README files in the root of each image.
2006-12-29 02:44:22 +00:00
Steve McIntyre cccbdd469f Gunzip the installation manual in .txt and .pdf format, so it's useful
on other platforms too.
2006-12-29 01:48:26 +00:00
Frans Pop 7af2565ecf * Add linux-image-2.6-prep for powerpc. 2006-12-29 01:14:28 +00:00
Frans Pop ebb664e6d5 Fix changelog 2006-12-29 01:11:44 +00:00
Steve McIntyre eb1131b3df Make make_disc_trees.pl and start_new_disc fail better on errors 2006-12-23 03:03:58 +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 5189fad5ae Promote Suggests: on delo, palo, netpbm, syslinux to Recommends: 2006-12-23 01:20:40 +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 0375525f9a don't depend on debootstrap any more - we grab and use the latest
version direct from the archive instead these days
2006-12-23 01:04:28 +00:00
Steve McIntyre e93bd79b7b don't depend on apt-utils any more - we don't use apt-ftparchive now 2006-12-23 01:00:31 +00:00
Steve McIntyre fc2c31eafb * change the mkisofs dep from (mkisofs | mkhybrid) to (mkisofs | genisoimage)
* remove Recommends on debianutils
2006-12-23 00:53:10 +00:00
Steve McIntyre 58e9b0005c Remove the SKIPMIRRORCHECK variable, now completely obsolete 2006-12-23 00:48:33 +00:00
Steve McIntyre 08e4962506 Make build_all.sh work again, adapting build.sh 2006-12-23 00:45:29 +00:00
Steve McIntyre 8232a68646 don't depend on jigdo-file any more 2006-12-23 00:25:44 +00:00
Steve McIntyre 9e51f3e13a Clean up comments in CONF.sh - remove outdated mention of jigdo-file 2006-12-21 14:36:45 +00:00
Steve McIntyre b600a32f13 * Update documentation to at least vaguely match how things work.
* Added support for hook scripts in a few places around the CD
 	creation process, to help people customise their CDs. Quite a
	lot of refactoring needed in make_disc_trees.pl needed to do that.
  * Removed more cruft:
    + old defs in CONF.sh
    + old defs and rules in the Makefile
    + tools/add_secured
2006-12-19 01:58:41 +00:00
Frans Pop 7741fc3c83 CONF.sh: don't determine ARCHES if already set; don't export CPU and KERNEL 2006-12-18 15:22:35 +00:00
Frans Pop 9227f45460 * CONF.sh: case can handle empty variables fine; whitespace cleanup 2006-12-18 15:14:49 +00:00
Steve McIntyre 27bf152cb6 Don't set DI_CODENAME separately by default 2006-12-18 14:38:10 +00:00
Steve McIntyre 7b6988d66d Make list2cds more verbose in log output, especially when dependencies have failed so a package can't be added 2006-12-18 13:40:53 +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
Joey Hess 41bf71f731 add file lists for xcfe desktop cds 2006-12-11 23:09:47 +00:00
Steve McIntyre 7780369fd4 * When we've finished making a CD tree in make_disc_trees.pl,
re-compress the gzipped Sources and Packages. Workaround for bug
    #402482 in busybox gunzip code.
2006-12-10 20:00:37 +00:00
Steve McIntyre 5098066aeb * Improve performance: rewritten tools/make_disc_trees in perl so we
can call add_packages directly as a perl function rather than via
    fork/exec all the time. Re-arranged tools/add_packages to make
    this work.
  * Improved logging in add_packages.
2006-12-10 18:57:53 +00:00
Steve McIntyre 60eef836ce * Lower-case package names at various points to work around apt bug
#402354. Fixes the long-standing warnings from list2cds about "Use
    of uninitialized value in string comparison", and allows some poor
    packages to make it onto CDs for the first time...
2006-12-10 02:18:28 +00:00
Steve McIntyre b9280f8c80 * Add Packages and Sources files to the Release file; clean up the
checksums. Closes: #402267
2006-12-09 22:31:23 +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
Frans Pop 82d1b005fc * tools/generate_di+k_list: no longer include kernel-image packages for
powerpc as we don't support 2.4 based installs anymore. Closes #401429.
2006-12-03 19:11:45 +00:00
Frans Pop 72fed62129 * tasks/exclude-etch: clean up packages no longer in the archive. 2006-12-03 18:59:13 +00:00
Steve McIntyre f4ab7392c5 * Another devel branch merge: Change tools/grab_md5 to also look for
md5sums in the installer suite as well as the archive suite in
    case they're different. Also removed old woody support, to clean
    up the code a little. Updated Makefile and update-cd to match the
    command-line interface change.
2006-11-30 22:15:31 +00:00
Steve McIntyre a46520a7fd Remove sh from the arch list in generate_di_list, to make builds quieter 2006-11-30 21:50:29 +00:00
Joey Hess 39ae9a2797 * build.sh: Don't force IMAGETARGET to bin-official_images when NOSOURCE
is set, if IMAGETARGET is also already set, as in a kde cd build.
2006-11-29 22:57:52 +00:00
Joey Hess f808c28d9a * Add a temporary hack in Debian_etch-kde to use sid d-i, to get a fixed
preseed that supports preseeding of tasks.
2006-11-29 21:25:17 +00:00
Frans Pop d79c7333ff * Fixed double target in yaboot.conf; reported on IRC by jbrand. 2006-11-28 20:04:46 +00:00
Joey Hess a14d96f363 switch to short form, which will actually work soon 2006-11-28 18:45:20 +00:00
Steve McIntyre ff845c2120 * Dump the mkisofs command-line used for each CD into .disk/mkisofs
as we make it. Closes: #258099
2006-11-28 00:19:55 +00:00
Steve McIntyre 4ded5ac8d9 * Add bpalogin near the top of the task list, as requested a long time
ago. Closes: #231583
2006-11-27 23:46:07 +00:00
Steve McIntyre 42583ba7b4 * Stop using the silly .raw extension for output images, use .iso instead
* Improve support for different disk types. Specify DISKTYPE in CONF.sh,
    and it will affect both the output name later (so it's now possible to
    distinguish between CDs and DVDs). Defaults to CD if not otherwise
    set. DISKTYPE will be used more in the future for sizing too, but that
    merge can wait a while longer yet. Closes: #361422
  * Use DISKTYPE and COMPLETE values to create the file .disk/cd_type for
    the installer to use.
2006-11-27 03:19:31 +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 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
Steve McIntyre 04dcde6a8b * Split final md5sum of images out from Makefile into tools/imagesums;
if we've made jigdo files then *don't* waste time running md5sum on
  the images as well!
2006-11-25 02:08:38 +00:00
Frans Pop 9924a80b78 * Include floppy disk images again for i386. 2006-11-23 00:42:39 +00:00
Joey Hess 80ea9ced5d * Add new language tasks to task.list.
* Add files to support building KDE CDs/DVDs. These would be images
  hardcoded to install the KDE desktop task, and to create them, configure
  CONF.sh as follows:
    TASK=tasks/Debian_etch-kde
    KERNEL_PARAMS='tasksel/first="kde-desktop, standard"'
    MAXCDS=1
    NOSOURCE=1
2006-11-15 23:07:42 +00:00
Steve McIntyre 67749b12c1 Change the default DEBVERSION from 3.2 to 4.0 to match etch. 2006-11-14 10:16:25 +00:00
Frans Pop 65539827e7 Remove line continuation inside perl command as that breaks with GNU Make 3.81 2006-11-14 10:05:21 +00:00
Frans Pop 2a9dbeb4d8 * Include "tape" images again for S/390. 2006-11-02 07:21:58 +00:00
Frans Pop b3b0343523 Update exclude-udebs:
- S/390 installs do not support loading udebs from the CD, so exclude all
- clean up obsolete exclusions for sparc
2006-11-01 02:29:10 +00:00
Frans Pop a4494d8a8e Update exclude-udebs:
- add ai-choosers, auto-install
- add some new gtk frontend related udebs
- globally exclude any discover udebs
2006-11-01 02:23:03 +00:00
Frans Pop 397b3a686f Update exclude-udebs:
- add debian-edu-archive-keyring-udeb
2006-11-01 01:33:34 +00:00