Commit Graph

52 Commits

Author SHA1 Message Date
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
Steve McIntyre 67749b12c1 Change the default DEBVERSION from 3.2 to 4.0 to match etch. 2006-11-14 10:16:25 +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
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 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
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
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 3743ff9f46 merge SPLASHPNG patch from debian-edu branch 2004-09-07 16:52:25 +00:00
Steve McIntyre 9924ef5c84 Copied CONF.sh into debian/
Fixed typo in the Standards-version
2004-08-19 17:55:03 +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
Raphaël Hertzog 0e25c9d6b3 - Updated for proper .disk/udeb_include support by default. 2003-05-07 18:06:52 +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
Petter Reinholdtsen 74f127219d Add CONTRIB flag to debian/CONF.sh. 2002-12-14 13:45:27 +00:00
Tollef Fog Heen a9cd01ec6d Add missing || true for the unset lines. 2002-07-12 06:13:19 +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
Raphaël Hertzog 1b7b7f846b * More syncing between CONF.sh and debian/CONF.sh. 2002-05-06 12:44:07 +00:00
Steve McIntyre 642a8d12fd Added definitions for DEFBINSIZE and DEFSRCSIZE 2002-05-06 12:00:59 +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
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
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
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
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
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
Ben Collins 2017c75b71 debian/CONF.sh: added defaults for new vars
tools/boot/potato/boot-sparc: updates for sparc CD's
2000-03-22 17:42:48 +00:00