Commit Graph

35 Commits

Author SHA1 Message Date
Frans Pop 26e0a2413d Workaround: don't include source for udebs in images
* list2cds: set "Component" for udebs to "debian-installer
* merge_package_lists: skip udebs when including source

When building images for Etch+1/2, which takes regular packages from
stable and udebs from testing, there is a problem when adding source
for udebs as existing code will take source for both debs and udebs
from stable. This can result in either incorrect source being included
(version mismatch) or errors (new udebs for which no match can be found
in the Source.gz file that is used).

A proper solution would require that the debian-installer section gets
its own Sources.gz file, but that is currently just not available.
After trying some things the conclusion was that the best solution for
now is to just not include source for udebs at all.

Patch written by Steve McIntyre.
2008-07-13 11:33:35 +00:00
Steve McIntyre 4c2837c737 * Significant cleanup of list2cds. Closes: #451237 2008-01-11 01:04:28 +00:00
Frans Pop d07d0ac8af * Instead of including all alternative dependencies in list2cds, only
include the first one. This reduces the size of the netinst and improves
  what's included on CD1. Only loss is console-{data,common,tools} so these
  are now added in generate_di+k_list.
2008-01-02 21:06:24 +00:00
Otavio Salvador 5f4cdb823e Revert the #410418 since it breaks too many things and to add it major changes will be required, not adding them now 2007-10-30 19:31:19 +00:00
Steve McIntyre d570bf3ad3 Add the missing ; 2007-10-30 00:56:16 +00:00
Otavio Salvador 8f92855bb7 Fix regressions found on r1475 walking on the queued packages twice 2007-10-29 22:58:25 +00:00
Otavio Salvador 35ef242061 Revert r1475 since it caused regressions. Will get back to it once time permits 2007-10-23 21:08:12 +00:00
Otavio Salvador e0213e29ca * Exclude packages and add all task present ones before resolve
dependencies, avoiding OR dependencies to take their place and removed
  packages dependencies to be included. Closes: #410418.
2007-09-28 18:41:02 +00:00
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
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 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
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 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 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 bc29265c97 Made list2cds more verbose 2005-06-05 00:13:18 +00:00
Raphaël Hertzog e088707860 - 1 line patch to fix a nasty (5 year old) bug. Closes: #285382
- Changed maintainer to debian-cd@lists.debian.org.
2005-01-09 18:17:21 +00:00
Joey Hess c9802cb2c2 - Add MAXCDS config variable, which forces debian-cd to stop after a given
number of binary CDs.
2004-07-02 19:28:02 +00:00
Otavio Salvador a279c2ed9c Preprocess exclude files much like tasks files are. Closes: #247379 2004-05-04 21:57:10 +00:00
Petter Reinholdtsen 64bd6c0546 Update list2cds to allow #-comments in the exclude file. 2004-04-24 11:42:13 +00:00
Raphaël Hertzog 458a589244 - Remove kernel cruft.
- Fix sorting in list2cds and cds2src (problematic with perl 5.8 and random
  hashes).
2004-01-29 00:39:07 +00:00
Josip Rodin 5b444e0468 more or less cosmetic language fixes 2003-07-24 23:42:55 +00:00
Josip Rodin 4ad8f25184 shortened some silly-code :) 2003-07-24 16:06:59 +00:00
Raphaël Hertzog f39afce541 - SKIPMIRRORCHECK=yes can disable the mirror check in build.sh
- Fix a bug that prevented udebs to be included.
2003-01-19 15:00:40 +00:00
Raphaël Hertzog dfa3530705 * Include patches from Petter Reinholdtsen and Santiago Garcia Mantinan.
* Include udebs without checking dependencies.
2002-12-26 10:39:02 +00:00
Raphaël Hertzog 1318755d05 * Include languages packs.
* Fix kernel name.
* New NOSUGGESTS option.
2002-03-25 10:03:53 +00:00
Raphaël Hertzog 718da6a3cc * Make the log output more consistent.
* Offer the possibilty to not force the inclusion of recommended/suggested packages.
2002-01-07 10:31:23 +00:00
Anne Bezemer 750974edcd * Added exclude feature for source packages and un-exclude feature
for binary packages.
2001-04-24 20:30:54 +00:00
Steve McIntyre 6ef81f9eb6 Added FORCENONUSONCD1 option - forces non-US packages/sources onto the
first CD where possible. We then make 2 copies of this, one with
non-US and one without. Useful for people wanting to create non-US and
US-safe CD sets without having to spend so much disk space.

Side-effects: The CD tress are now $(DIR)/CD<foo> instead of
$(DIR)/<foo>
2000-06-16 23:42:50 +00:00
Raphaël Hertzog 5d4ff3914e * Added support for EXTRANONFREE. Hope it works :-) 2000-06-06 17:19:27 +00:00
Dan Jacobowitz 0b6a1c2ebf PowerPC boot support 2000-05-01 04:59:02 +00:00
Raphaël Hertzog ad9dd80b45 * Documentation updates.
* Changed how the sizelimit is get by the scripts (they could have ignored
  values given by the environment variable).
* Put the documentation tree from the mirror on the first CD only.
2000-04-03 22:05:07 +00:00
Ben Collins a2ccae3471 * Added two new variables, COPYLINK and APTTMP. I had to do this with my
setup which consists of an NFS mounted archive, the NFS mount was also
  used for the tmp space since it had room, and the iso images were
  created on the local drive, where it also had room. DOing symlink was
  crazy and didn't work too well, and the apt stuff could not be on the
  NFS tmp since apt's locking doesn't work on NFS. Problem solved, this
  should work exactly like it did before with these defaults though.
  COPYLINK basically makes a full copy of the files instead of hardlinking
  or symlinking.
2000-03-14 04:02:29 +00:00
Raphaël Hertzog 92504f2149 * Many modifications to support the inclusion of local packages
available in dists/$CODENAME/local/binary-$ARCH.
* Updated documentation in several places.
* Updated CONF.sh.
* Added an empty task.
2000-03-07 18:59:31 +00:00
Adam Di Carlo e83ef58217 Initial revision 1999-11-11 17:10:37 +00:00