Commit Graph

1134 Commits

Author SHA1 Message Date
Steve McIntyre 67d9909bbe Make sure the mkisofs options file goes in the right place 2006-12-21 15:27:50 +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 77e3c9015c Add extra logic to source-tracking code. If we have more than 1 binary
arch along with source, there's a chance that the different arches may
have refs to a particular binary package (and hence its source) at
completely different points. Rather than just go with the one we find
first (from the first binary ref), make sure that the source will
match up with the earliest binary record, measured across all arches.

As noticed on the multi-arch DVD; make sure that source:kde-i18n makes
it into the package list before amd64:kde-i18n-ar.
2006-12-21 03:45:01 +00:00
Joey Hess 504f661fb5 add 2006-12-20 19:28:11 +00:00
Steve McIntyre 74e9050525 rearrange to make sure is set before we set 2006-12-20 11:02:59 +00:00
Steve McIntyre 4bb6ee2bbe Always create an empty mkisofs_dirs file for each image; stop warnings about missing files later when we source them in 2006-12-19 17:15:16 +00:00
Steve McIntyre 61c1630ab1 Cosmetic fix - list source in too in debug 2006-12-19 15:57:15 +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 05905f9e37 Better estimation for HFS media (m68k/ppc) 2006-12-12 02:10: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 8aa2c36dd0 regenerated with current tasksel 2.59 2006-12-11 23:20:21 +00:00
Joey Hess 41bf71f731 add file lists for xcfe desktop cds 2006-12-11 23:09:47 +00:00
Steve McIntyre a0d4cebccc Tweak how much we need to run mkisofs 2006-12-11 18:03:16 +00:00
Steve McIntyre ad1906c27b Even more accurate size estimation; reduce how much we need to run mkisofs 2006-12-11 17:52:25 +00:00
Steve McIntyre 8b318a9693 Tweak the size-checking threshold to make things faster 2006-12-11 15:50:49 +00:00
Steve McIntyre 277fc58f3d When rolling back, cope with package names that are not regexp friendly 2006-12-11 15:47:18 +00:00
Steve McIntyre e1116e39e4 typo fix 2006-12-10 22:37:38 +00:00
Steve McIntyre 96608804fc Remove the old shell version of make_disc_trees
Missed changing one of the invocations of add_packages - now fixed
2006-12-10 22:36:08 +00:00
Steve McIntyre 52d0a9f08b Round off the DVD size in blocks 2006-12-10 22:23:51 +00:00
Steve McIntyre cf079be95b Re-add the build date to .disk/info, lost in the merge 2006-12-10 21:27:06 +00:00
Steve McIntyre 5b26423869 Minor tweaks for businesscard CDs 2006-12-10 20:12:46 +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 50058df56f * 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:29 +00:00
Steve McIntyre eb73154582 Reimplement make_disc_trees in perl for better performance. More to come... 2006-12-10 15:26:19 +00:00
Steve McIntyre 4ab80a6392 Cosmetic cleanup ; make things work again when not using VERBOSE_MAKE 2006-12-10 15:14:21 +00:00
Steve McIntyre f6e24e76fa Cosmetic changes to listcds 2006-12-10 15:13:12 +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 44b17db956 Don't check source-only discs for installability of base 2006-12-08 16:00:36 +00:00
Steve McIntyre d3aa586a36 Fix simple cut-n-paste error 2006-12-08 13:55:52 +00:00
Steve McIntyre 7c746a97e9 Slightly cleaner handling of mkisofs_opts and _dirs 2006-12-08 12:17:24 +00:00
Steve McIntyre e9be1e7c20 Make the FAQ extraction not be verbose 2006-12-08 11:56:52 +00:00
Steve McIntyre a3ca8e7c21 Make the choice of config file more explicit 2006-12-08 11:40:16 +00:00
Steve McIntyre 2d1735aa21 Make sure we use the specified mkisofs in make_disc_trees
Make the missing-base-files debootstrap errors less scary-looking
2006-12-08 09:46:18 +00:00
Steve McIntyre 73f3f85b6b Match *CD rather than CD for the 650MB image size, so the KDE builds work 2006-12-08 00:48:08 +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
Steve McIntyre 4c83b14ad9 Fix md5sum file format 2006-12-05 17:52:07 +00:00
Steve McIntyre a689886868 Fix typo bug, improve error handling 2006-12-04 17:23:57 +00:00
Steve McIntyre 0d08a2a2d7 Fix simple logic problem: s/// 2006-12-04 11:41:28 +00:00
Steve McIntyre 5246ae846e Doh! Fix source builds - need to change how grab_md5 is called 2006-12-04 11:38:19 +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