Commit Graph

143 Commits

Author SHA1 Message Date
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
Steve McIntyre 0376061922 Add better GNU/kFreeBSD support in setting ARCH in CONF.sh.
Closes: #327470
2006-06-08 00:26:24 +00:00
Steve McIntyre f7a94acfc8 Cope with mipsel boot images moving location. Closes: #349563 2006-01-24 00:08:23 +00:00
Steve McIntyre f14e1a50c5 Last bits of JTE merge 2005-12-07 00:28:18 +00:00
Joey Hess c55c1cc139 * Since debootstrap is in sbin, add sbin to PATH.
* Remove other random hadcoded paths to programs in bin.
2005-09-14 18:28:10 +00:00
Joey Hess c540a0d13e * Now build etch CDs by default.
* Remove DH_CODENAME unset from CONF.sh, to allow it to be passed in
  via the environemtn. Closes: #326814
2005-09-07 19:18:41 +00:00
Joey Hess 1904f2c2b8 * Now build etch CDs by default. Closes: #326814 (except the unset bit
possibly)
2005-09-07 19:14:12 +00:00
Steve McIntyre 6c649c1932 Added patch from Frans Pop (#320206) to make EXCLUDEs use $CODENAME
Update changelog - the sed hack for the sarge release has been removed again
2005-07-30 00:00:47 +00:00
Joey Hess 5d29448ae3 - Use dpkg --print-architecture instead of now-deprecated
--print-installation-architecture
2005-06-12 22:57:24 +00:00
Steve McIntyre 74ed0539fd Multiple changes before final release:
* Add release notes to CD#1 on full CD/DVD sets, and link them from
    README.html
  * Tweak the generated Release files to be "stable" rather than
    "testing"
  * Added Sven's patch: a pegasos forth boot script
2005-06-04 14:36:59 +00:00
Joey Hess dab6547bfa - debian-installer task files renamed to include distro name and branched
for etch.
2005-05-15 16:46:50 +00:00
Joey Hess 42a763d6e7 - Add OMIT_MANUAL variable, which can be set to 1 to drop the install
manual from small CDs to save space. We will probably be adding several
      new translations, and possibly PDFs, and that would use too much space
      on the small CDs.
    - Also make the README link to the manual on the Debian web site if
      OMIT_MANUAL=1.
    - Update the README to mention manual translations are available.
2005-03-03 02:03:45 +00:00
Joey Hess f2a09e36ce fix YA accidental commit of this file 2005-02-04 19:55:43 +00:00
Joey Hess df15e58082 Exclude more new kernel images from CD1. 2005-02-04 19:54:19 +00:00
Joey Hess 30cd72ddd5 fix accidental commit 2004-09-23 16:11:22 +00:00
Joey Hess 9c9eeb612c i 2004-09-23 16:09:03 +00:00
Joey Hess 3743ff9f46 merge SPLASHPNG patch from debian-edu branch 2004-09-07 16:52:25 +00:00
Steve McIntyre e3d45999e8 Update default version to 3.1 for a sarge release 2004-08-18 17:06:34 +00:00
Joey Hess 3969a9bed1 - Switch CONF.sh to sarge.
- Uncomment exclude lines.
2004-07-17 23:20:58 +00:00
Joey Hess 4c1d4214ae document IMAGETARGET in CONF.sh 2004-07-15 23:07:06 +00:00
Joey Hess 3387388c64 - NORECOMMENDS should be used for sarge official CD sets (getting full
tasks is more important), and is on by default.
2004-07-15 01:50:10 +00:00
Joey Hess 27207d72aa document DI_WWW_HOME 2004-07-14 20:58:57 +00:00
Joey Hess 96791cc2db MAXCDS should be exported 2004-07-14 20:54:32 +00:00
Petter Reinholdtsen e29828b228 Untabify. 2004-07-09 22:58:03 +00:00
Joey Hess f4db02836f merge KERNEL_PARAMS support from debian-edu branch 2004-07-03 00:48:28 +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
Steve McIntyre 9abd411bd1 Removed the -T option to mkisofs. We don't need the TRANS.TBL files
any more, and we should save the space.
2004-06-09 18:54:35 +00:00
Petter Reinholdtsen b6417564c6 Make sure DI_CODENAME is not taken from the environemt by from the config file. 2004-03-10 21:59:04 +00:00
Santiago Garcia Mantinan 80faafdf64 Add DI_CODENAME variable make it posible to build cds with a special
debian-installer version.
2004-03-08 13:43:40 +00:00
Richard Atterer e6440d5a07 Added code/docs for automatic generation of fallback directories during jigdo generation 2003-12-18 10:22:38 +00:00
Petter Reinholdtsen dcf6ee4f5d Add support for UDEB_INCLUDE and UDEB_EXCLUDE, making files cdrom/.disk/udeb_include and .../udeb_exclude used by debian-installer. 2003-05-02 12:55:21 +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
Petter Reinholdtsen ca36edb6c3 Document BOOTDISKS. 2002-12-14 13:58:15 +00:00
Petter Reinholdtsen 5ae7bd488d Remove duplicate base_components creating. Add support for BASE_INCLUDE
and BASE_EXCLUDE, making files cdrom/.disk/base_include and
.../base_exclude used by debian-installer.
2002-12-14 13:53:18 +00:00
Tollef Fog Heen 916440cf9a add support for excluding contrib. 2002-12-07 10:22:40 +00:00
Tollef Fog Heen 1bcb8fae21 Add missing || true for unset NONUS 2002-07-12 06:12:37 +00:00
Tollef Fog Heen 40c7cb2411 Patch courtesy of Petter Reinholdtsen, hand-applied because of conflicts.
- Preserve timestamps when copying files into the CDs
 - Make sure build.sh can run in -e (stop on error) mode
 - Report if packages needed by debootstrap is missing on a CD
 - Report how much space is reserved on each CD
 - Handle boot-floppy directories without documentation
2002-07-11 22:01:44 +00:00
Tollef Fog Heen 37c00f7c39 Apply patch from Petter Reinholdtsen to put the security updates onto
the cd.
2002-07-11 21:40:17 +00:00
Philip Hands 4949337269 make the Non-US server entry added to .jigdo files by publish_cds point
at the new non-US.cdimage.debian.org name for open, so we can move
cdimage.d.o to raff.d.o in the near future.
2002-05-06 17:19:05 +00:00
Philip Hands 2d2c8a7db9 add fast_sums and publish_cds variables to debian/CONF.sh
fix comment typo in CONF.sh
2002-05-06 11:38:53 +00:00
Philip Hands 9fac563381 move publish_cds into the tools directory, update it to the version
currently in use, and add the variables it needs to CONF.sh
2002-05-06 10:23:32 +00:00
Philip Hands 487ac3dff4 Add tools/fast_sums script that I'm using to create the md5sums on
cdimage.d.o
It's disabled by default, so this should not change the behaviour
for people that don't use it, although I don't think there's any reason
not to.
2002-05-05 12:08:27 +00:00
Raphaël Hertzog 139fd6593f * Fix handling of NONFREE/EXTRANONFREE variable.
* Update the order of the boot images for i386 :
  1: isolinux multiboot
  2: vanilla
  3: compact
  4: idepci
  5: bf2.4
* Put ISOLINUX=1 by default. Added it to CONF.sh.
2002-04-13 12:17:57 +00:00
Steve McIntyre 5b892f4ae9 Added support for DVD-sized images. Specify default image sizes in
CONF.sh as DEFBINSIZE and DEFSRCSIZE

build.sh and build_all.sh now use these settings to calculate the
packages and source files to go on each disk, using bc - shell
arithmetic cannot cope with > 32-bit numbers

use the md5sum from the textutils package - dpkg's md5sum cannot
handle large files.
2002-04-07 16:26:59 +00:00
Raphaël Hertzog 1318755d05 * Include languages packs.
* Fix kernel name.
* New NOSUGGESTS option.
2002-03-25 10:03:53 +00:00
Anne Bezemer b7582144e3 Add jigdo generation support 2002-01-28 23:00:17 +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
Raphaël Hertzog d9b5e6200a * Drop slink support.
* Drop dpkg-multicd support.
* Uses apt-ftparchive instead of dpkg-scan{packages,sources}
* Try to use extra override file (for Task: fields), not tested.
2001-10-06 15:55:12 +00:00
Raphaël Hertzog 7cd4b17f40 * The inclusion of the secured tree is now controlled by the
SECURED environment variable. It is *disabled* by default
  (thanks to jgg who doesn't want to correct apt even if he
  proposed the current scheme)
* Priority optional (same than in the overrides)
2001-07-21 15:50:09 +00:00
Steve McIntyre 5401c5944b s/prerelease/beta/
"prerelease" is too long to use in the volid; mkisofs complains and
the build drops out.
2001-07-12 01:30:29 +00:00
Raphaël Hertzog c649f77c21 * Updated Woody version number.
* Build woody CDs by default.
* Updated documentation.
2001-07-10 09:57:43 +00:00
Raphaël Hertzog 2afe58456b * Removed -a from mkisofs call. 2001-05-19 13:29:52 +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
Philip Hands a03167f409 CONF.sh:
VERBOSE_MAKE variable added.  allows the verbosity of the make process
    to be controlled, by determining if the lines start with a @ or not
  ATTEMPT_FALLBACK variable added.  allows one to control whether build_all.sh
    should bother to attempt to build a simple CD if the official build
    fails.

Makefile:
  o  added "set -e;" to the start of most of the blocks of shell commands to
     ensure that if one of the scripts fails, that fact is not ignored
  o  replaced many of the @'s with $(Q) and ensured that Q=@ by default.
     This allows one to see what make is actually doing when it all goes
     horribly wrong -- VERBOSE_MAKE in CONF.sh is used to control this

build_all.sh
  o  made it stop on error dependant on ATTEMPT_FALLBACK from CONF.sh

tools/pi-makelist:
  These are the changes by J.A. Bezemer to get rid of files from the list
  that are not available on ftp mirrors

tools/boot/potato/boot-alpha
  check to see if the boot1 directory already exists, and skip its creation
  if so.  This is required to deal with the fact that this script gets called
  for CD1 & CD1_NONUS, and making the directories twice fails, and is pointless
2000-08-25 16:54:03 +00:00
Anne Bezemer 9874e3548e DEBVERSION (+examples) now like "2.2 r0" according to discussions on
debian-cd list.
Copied FORCENONUSONCD1 to debian/CONF.sh, where it wasn't mentioned yet
(i.e. it would become a "hidden feature" in the .deb package).
2000-08-12 22:36:50 +00:00
Raphaël Hertzog 3c4dd7d6db * Added "-F ." for symlink farmers... 2000-07-02 11:09:34 +00:00
Raphaël Hertzog 898a7e92f8 * Patch from Joey Hess for LOCALDEBS.
* Patch from Michael Schlueter for a bugfix related to forcenonusoncd1.
* Patch from myself : s/*.packages/?.packages/ in tools/scanpackages !
  It's a problem that appeared with the use of FORCENONUSONCD1 and LOCAL.
2000-06-30 00:04:03 +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
Raphaël Hertzog edbe3d2bd9 * Added documentation (README.html & README.txt) that replaced some
old doc. Needs a lynx dependency.
* Added arm support.
* Failry large changes to the Makefile due to the added documentation.
* Make the translated documentation more available.
* Copied some files from potato dir to the woody dir (so that we can
  still build woody CDs).
2000-05-18 22:49:02 +00:00
Raphaël Hertzog a02ac07d1c * Reversed some changes made by Dan. Corrected build_all.sh
& build.sh with good sizes.
2000-05-01 09:16:59 +00:00
Dan Jacobowitz 0b6a1c2ebf PowerPC boot support 2000-05-01 04:59:02 +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