Commit Graph

177 Commits

Author SHA1 Message Date
Steve McIntyre 4c0e41e465 * Add support for tracking which packages we've extracted binaries from,
so that we can archive them (both binaries and sources). If we need
    anything, we will list it in CD$N.pkgs_extracted so that external
    scripts can pick it up and do whatever's needed.
  * Minor changes to the interface of tools/which_deb to accommodate that:
    now just lists the files *within* the mirror; it's up to callers to
    prepend ${MIRROR} as needed.
2008-11-23 18:19:25 +00:00
Frans Pop 1eac5a9d65 Generate tasks dynamically; separate task files per distro release
All tasks files are moved to ./tasks/<codename> subdirectories so they
can be more easily kept up-to-date with specific distro releases.

Always generate the debian-installer and tasksel tasks dynamically:
- all task files for the desired suite are copied to the working
  directory at the beginning of each build, and are used from there;
- the debian-installer and tasksel tasks are no longer included in
  releases but are always created automatically at build time; this
  means users no longer need to run the generate_di_* scripts or the
  update_tasksel script;
- the popcon task file will remain included as a static file, but plan
  is to add an option to update it automatically for each build; reason
  is that updating it requires network access.

Bump version to 3.1.
2008-11-13 23:19:30 +00:00
Frans Pop 5b5f073811 update_tasks requires BDIR to be created 2008-11-10 13:40:45 +00:00
Steve McIntyre b45e780519 Rename list2cds to sort_deps - more accurate name now that other code does the per-disc splitting later 2008-11-01 23:08:01 +00:00
Frans Pop bdb3e3984b Remove no longer used references to rawlist.exclude and list.exclude files
These files have not been used since the introduction of make_disk_trees.pl.
Remove remaining references, which results in a nice clean up of the Makefile.
2008-11-01 23:06:59 +00:00
Frans Pop 4c7f7c7f16 Only check/extract debootstrap if MIRROR is set to avoid errors for unrelated targets 2008-10-17 08:38:37 +00:00
Frans Pop 274c7dd7a0 Revert "Drop ancient workaround for dependency resolution"
Looks like the workaround is still needed after all, so just remove
unifont from the packages that are forced.

Also, add pptp-linux to images using the di+k list instead of through
this hack (changelog says adding it here needed "FIXME later...").
2008-10-14 12:39:32 +00:00
Frans Pop 151c38eedf Drop ancient workaround for dependency resolution
With all the code changes we've had in list2cds this is probably
no longer needed. Really gets rid of unifont on the netinst.
2008-10-14 11:37:52 +00:00
Frans Pop 53a5657a7b Quieten creation of symlink to debootstrap dir 2008-10-14 08:21:54 +00:00
Steve McIntyre 60dbf627e2 * Major licensing problem cleanup: (Closes: #497270)
+ Remove binary blobs from the package; pull those files from the
      .debs in the archive as needed (isolinux.bin, vesamenu.c32)
    + sbm.bin *not* yet worked out, so drop it for now
    + Pull out the code to find the right deb and put it in a new helper
      shell script (tools/which_deb), called from Makefile and boot-* as
      needed.
2008-09-15 23:09:18 +00:00
cd-builder user 7462c548dc * Improve control over production of iso and jigdo files. Replace the
simple DOJIGDO config option with MAXISOS and MAXJIGDOS, allowing
    more flexibility. Allows us to only produce a small number of iso
    images for less-popular architectures but still produce all the jigdo
    files, saving a lot of disk space.
2008-09-10 22:16:18 +00:00
Steve McIntyre 91a3431238 Make sure we use the right version of debootstrap for the build 2008-07-18 12:41:02 +00:00
Steve McIntyre fe6cc6f846 export BDIR for script use 2008-06-06 23:24:11 +00:00
Steve McIntyre 2f46e78135 * Pre-cache apt's package information in large lumps rather than walk
through it one package at a time. It's much faster. Closes: #470838
    Needs a small re-arrangement: code from tools/add_packages and
    tools/link.pl now moves into tools/make_disc_trees.pl
2008-03-20 09:43:22 +00:00
Raphaël Hertzog 8fd196b6b0 Add new OMIT_DOC_TOOLS option to work with (partial) mirrors lacking the
doc and tools directories.
2008-03-05 21:17:42 +00:00
Raphaël Hertzog 0e0769bf3f * If genisomage is not available, try to fallback on mkisofs. 2008-03-05 15:55:17 +00:00
Raphaël Hertzog b68d75725c * Switch to genisoimage as default ISO generator as mkisofs has been dropped
from Debian. Closes: #468850
* Add Vcs-Browser field.
2008-03-05 15:47:51 +00:00
Frans Pop 80ec9c9198 * Makefile: debootstrap no longer accepts options with empty values; change
the way include/exclude options are passed accordingly.
2008-01-19 10:17:09 +00:00
Steve McIntyre 4c2837c737 * Significant cleanup of list2cds. Closes: #451237 2008-01-11 01:04:28 +00:00
Steve McIntyre 7957f3b3ef * Newer versions of debootstrap have moved the scripts from /usr/lib to
/usr/share. Add a sym-link to cope - let's keep compatible with etch
    as much as possible. Also, log what debootstrap told us (in
    debootstrap-list) rather than just including the results directly in
    rawlist.
2007-11-19 23:44:35 +00:00
Steve McIntyre 4a636647f1 Temporarily back out Otavio's change from r1488 2007-11-19 23:34:22 +00:00
Otavio Salvador 5adeab2992 * Change DEBOOTSTRAP_DIR to /usr/share/debootstrap since it has been
changed on debootstrap 1.0.7
2007-11-19 11:55:07 +00:00
Otavio Salvador b96a9aeca2 * Hide image creation command if not using verbosing make 2007-11-19 11:55:00 +00:00
Otavio Salvador 8ae6b15230 Closed quotes, grr 2007-10-13 13:26:49 +00:00
Otavio Salvador bd3c87bde3 Fix r1478 change to don't fail if BASE_{INCLUDE,EXCLUDE} isn't set (fix simple-cdd usage, I think) 2007-10-13 13:26:08 +00:00
Otavio Salvador f652d60b84 * Use DEBOOTSTRAP_SCRIPT, BASE_INCLUDE and BASE_EXCLUDE variables to
calculate the base packages set
2007-10-06 18:25:30 +00:00
Steve McIntyre 21ebb87b03 Update unstable-map: in the Makefile - use lenny rather than etch 2007-07-19 21:12:20 +00:00
Steve McIntyre 62fdf616e7 Re-added DEBOOTSTRAP_DIR definition in the Makefile 2007-05-11 21:52:22 +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
Raphaël Hertzog a2d9587f1a Don't rely on PATH containing the tools directory. 2007-02-21 14:13:35 +00:00
Frans Pop aabb225eb7 Fix minor gramatical error in logging 2007-01-05 07:32:09 +00:00
Steve McIntyre cdbd9971ba Bugfix for dedicated-src on multi-arch 2007-01-02 01:42:10 +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 f6e47116af Minor cleanup/re-sorting of Makefile, to make documentation easier 2006-12-28 02:38:00 +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
Steve McIntyre 4ab80a6392 Cosmetic cleanup ; make things work again when not using VERBOSE_MAKE 2006-12-10 15:14:21 +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 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 5246ae846e Doh! Fix source builds - need to change how grab_md5 is called 2006-12-04 11:38:19 +00:00
Steve McIntyre a12fe9fd65 Minor cleanup of the image sums stuff 2006-12-03 16:40:12 +00:00
Steve McIntyre 93fe864b6f * 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:13:42 +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 0d7c8c6253 Try again for dates 2006-11-26 22:46:57 +00:00
Steve McIntyre 82bb97f5ee Try again for dates 2006-11-26 22:45:14 +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 a6dc53f5a5 Whitespace 2006-11-14 11:06:19 +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
Steve McIntyre 9bb616bedf Minor changes to README.html.in and generation of README.html: cope
with unofficial, official beta and official release CDs better. Let's
not repeat the sarge mistake. Closes: #312604
2006-10-05 23:08:09 +00:00
Steve McIntyre 5d2516c0cd Try to fix the "unofficial development version" bug on official CDs. 2006-08-20 22:31:19 +00:00