Commit Graph

114 Commits

Author SHA1 Message Date
Steve McIntyre 3c3aa8d79b * Add disk size definitions for 1/2/4/8 GB USB sticks.
* Extend the size-override code to allow to override an individual disc
  in the set (e.g. to make the first DVD fit on a 4GB USB stick).
2011-02-23 13:41:33 +00:00
Steve McIntyre 6e44e0ff27 start wheezy development; svn cp squeeze wheezy and s/squeeze/wheezy/ 2011-02-07 22:30:21 +00:00
Steve McIntyre 21c4887e35 CONF.sh: fix up the -jigdo-min-file-size option to use 1024 instead of
0; genisoimage used to fix this up, but xorriso doesn't.
2010-12-27 19:29:16 +00:00
Steve McIntyre fc722916d0 * Add code to make isohybrid images for i386/amd64:
+ Makefile: Add support for overriding the MKISOFS and MKISOFS_OPTS
      variables on a per-arch basis
    + CONF.sh: add working examples for this
    + tools/boot/squeeze/boot-x86: if configured to use xorriso, add the
      extra command line options to add the isohybrid MBR. Also work
      around a difference in ISO directory naming between genisoimage and
      xorriso.
2010-12-24 23:28:44 +00:00
Steve McIntyre f3928178e9 * Change the default for NORECOMMENDS to 1 for consistency with
NOSUGGESTS. Closes: #598196
* Documentation patches
2010-09-29 13:13:04 +00:00
Steve McIntyre 17b0ad94ef Don't reset the value of by default 2010-07-09 11:54:19 +00:00
Steve McIntyre cfd48f468e turn OFF force_firmware by default 2010-05-27 00:55:47 +00:00
Steve McIntyre b9c25ca204 * Add support for forcing firmware packages onto CD#1:
+ Add "FORCE_FIRMWARE=1" to CONF.sh to turn this on
    + Will pick up on packages in the "firmware" task and install them
    + Will also add sym-links to them in CD1/firmware so that new d-i code
      can find them easily.
    + Will add a short sentence into README.html/README.txt
  * Add top-level control of which checksums are desired for output images
    see the CHECKSUMS setting in CONF.sh
  * Fix some bashisms in tools/apt-selection.
2010-05-27 00:52:25 +00:00
Steve McIntyre 38423b9daa Export the CDNAME variable in the conf file. Patch from Karl Goetz. 2010-02-21 21:40:25 +00:00
Steve McIntyre 37f2de9fbf Improve the description for MAXCDS in the conf file. Patch from Karl Goetz. 2010-02-21 21:27:50 +00:00
Steve McIntyre 9590c06ddd Add support for coping with packages that are too large to fit. If we
have to remove packages and their dependencies, list them in
README.excluded in the root of disc 1.
2009-11-21 00:14:26 +00:00
Frans Pop e9c608e6b7 Add support for producing disks with (optional) extra variants
This patch from Ian Cambell adds the generic support code:
   * CONF.sh:		Add $(VARIANTS) configuration variable.
   * eash-build.sh:	Add command line parameter to enable variants.
   * Makefile:		Define VARIANT_xxx when preprocessing package list.
   * boot/?/common.sh:	Add a function for checking if a variant is enabled.
   * generate_di_list: 	Allow variant overrides in udeb exclusion list.

Variant support is documented in docs/README.variants

The intention is to use this support to add support for installing a
Xen guest from an ISO image.

The approach to use varriants was originally suggested by Frans Pop.
2009-08-09 14:32:55 +00:00
Frans Pop 27c98b9a17 Add support for and update to squeeze
The Debian version for squeeze has already been set:
http://lists.debian.org/debian-release/2009/01/msg00682.html
2009-02-15 22:42:47 +00:00
Frans Pop 2e4fa00e42 Remove a non-ascii character that somehow slipped in 2009-02-04 22:52:01 +00:00
Frans Pop c1c4988efa Split out languages supported by D-I and tasksel from task.list files
* Instead of duplicating what language tasks should be included in each
    task.list.* file, let update_tasks add them dynamically at runtime from a
    single list of languages supported by tasksel and D-I. This also makes
    maintaining the lists a lot less painful.
  * Indicate which tasks are "secondary" by adding a "-" suffix in task.list.*
    files instead of hardcoding it in update_tasks.
2008-12-05 14:12:10 +00:00
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 a0a21c149c At least mention EXCLUDE in CONF.sh 2008-11-13 23:19:35 +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 ef7069ec7a CONF.sh updates
- change default CODENAME to lenny
- change example paths to mirror to /srv/mirror instead of /mirror
2008-10-14 08:40:58 +00:00
Frans Pop d48db452d6 Make use of MAXISOS and MAXJIGDOS more consistent 2008-10-14 08:21:57 +00:00
Frans Pop 13f5f20f46 Allow to skip generating MD5 and SHA1 sums files 2008-09-20 19:36:42 +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 0f046a93ab cleanup of CONF.sh 2008-07-29 18:58:45 +00:00
Steve McIntyre b402ea3ba7 * Applied patch from Robert Millan <rmh@aybabtu.com> to allow choice of
desktop when building for win32-loader. Closes: #491300.
2008-07-29 17:29:32 +00:00
Frans Pop d8c8f095e6 Support including packages from proposed-updates
This can be useful for pre-release testing of point releases, but should
be used with care when CDs are intended to be published.
2008-07-13 11:45:10 +00:00
Steve McIntyre 71039d6ead * Add support for dual-layer DVD, Blu-Ray and dual-layer Blu-Ray
discs. Nothing special, just extra sizes recognised.
2008-06-28 14:08:41 +00:00
Frans Pop 42b3e73167 Lenny will be version 5.0 2008-03-08 18:54:57 +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
Frans Pop a39f2514a5 * CONF.sh: Don't set MAXCDS by default; was probably changed by accident. 2007-12-11 21:51:36 +00:00
Frans Pop 808cc88159 * CONF.sh: add non-invasive option to avoid sourcing CONF.sh twice when
using wrapper scripts.
2007-12-11 21:43:30 +00:00
Steve McIntyre 2fae5806e9 * Don't hack with the Release file unless EARLY_BUILD_HACK=1.
Closes: #423463
2007-05-12 00:33:34 +00:00
Steve McIntyre e48d79db5b Improve commenting around INSTALLER_CD option further 2007-01-24 15:38:30 +00:00
Steve McIntyre 67564df54c Improve commenting around INSTALLER_CD option 2007-01-24 14:43:44 +00:00
Frans Pop f245fa4115 * Remove SRCEXCLUDE which is no longer supported. 2007-01-18 23:32:23 +00:00
Frans Pop 0916c1be82 Envvar NOSOURCE was obsoleted; minor whitespace cleanup 2007-01-05 06:49:52 +00:00
Steve McIntyre d53fd344a7 Update CONF.sh, better commenting for EXCLUDE syntax 2006-12-29 05:59:45 +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 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 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
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
Frans Pop fdbcef329a Set correct version for Etch (4.0) 2006-11-14 10:14:30 +00:00
Steve McIntyre 11cc7d189a * s/sarge/etch/ and s/3.1/3.2/ in CONF.sh
* Last upload ready for the etch release (hopefully)
2006-10-08 12:54:49 +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 c065e67805 * Update the suggested DVD size in CONF.sh to a saner number
* Re-sync CONF.sh over debian/CONF.sh
2006-10-05 22:55:28 +00:00
Frans Pop fbcc342efa Introduce new environment variable NOSOURCE that allows to build CD images
using a local mirror that does not contain source files. This new variable
obsoletes setting IMAGETARGET, though that is still supported for backwards
compatibility.
2006-10-01 19:39:11 +00:00
Steve McIntyre f74103a020 Fix in shell logic for ARCH detection; make sure we don't have a
non-zero exit code, as build.sh will fail then.
2006-06-08 00:46:58 +00:00