Commit Graph

9 Commits

Author SHA1 Message Date
cd-builder user 58a40d32b7 Cope better with source/binary package mismatches 2008-09-10 21:59:32 +00:00
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
Frans Pop f096552f3b Fix indentation 2007-06-22 15:18:10 +00:00
Steve McIntyre febd6c144e weird props problem 2007-06-22 14:54:50 +00:00
Steve McIntyre 52ca77be04 * Fix for multi-arch CDs including source - the extranonfree update
broke the source output
2007-06-22 14:49:17 +00:00
Steve McIntyre 8fad42f5fd * Fix for multi-arch CDs including source - the extranonfree update
broke the source output
2007-06-22 14:42:43 +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 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
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