Commit Graph

191 Commits

Author SHA1 Message Date
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
Joey Hess 25cc1f62e8 * Remove exim4 from the netinst CDs by adding further insane cruft to the
insane cruft already in the Makefile. (debootstrap no longer installs an
  MTA, so this should save some useful space on the netinsts)
2005-12-27 04:25:23 +00:00
Steve McIntyre 773b972935 Fix the "shortinfo" output in jigdo files 2005-12-18 19:34:35 +00:00
Steve McIntyre 8561aff963 Fix typo; s/ppptp/pptp/ 2005-12-17 19:14:31 +00:00
Steve McIntyre 38d277b76b Add the ppptp-linux package to CD#1. Quick hack adds this from the
Makefile for now; FIXME later... Closes: #255367
2005-12-17 18:13:44 +00:00
Steve McIntyre c275d5187d * Split out the code that copies debs into the temporary trees and
creates Packages files from the Makefile into tools/add_debs
* Split out the code that copies sources into the temporary trees and
  creates Sources files from the Makefile into tools/add_source_packages
2005-12-11 00:39:10 +00:00
Steve McIntyre 5e16cfe7f9 Quote the params to make_image to make sure they work... 2005-12-08 23:46:42 +00:00
Steve McIntyre 1f19193d3c Split out the actual ISO/jigdo creation code from the Makefile into
tools/make_image
2005-12-08 22:55:19 +00:00
Steve McIntyre 537afe73f2 Checking in JTE changes 2005-12-07 00:12:11 +00:00
Joey Hess 8140171580 * Add default UDEB_EXCLUDE files that differ for businesscard, netinst, and
full CDs.
* Make the full CD have apt-mirror-setup in its udeb_exclude file, to avoid
  that component being installed to satisfy apt-setup's dependency on it (I
  hope), so that the user is not unncessarily asked for a mirror during a
  full CD install, but is still asked for one during installs from the
  smaller CDs.
2005-11-15 00:28:07 +00:00
Joey Hess 04999c7f3b * Change debootstrap --print-debs calls to pass debootstrap a mirror to use
and a temporary directory to work in, so it will avoid downloading the
  Packages files from its hardcoded mirror, and work on amd64 and other
  situations with a non-official Debian mirror. Neccessary since the new
  version of debootstrap has dependency resolution enabled by default.
2005-10-30 19:12:22 +00:00
Joey Hess 2fbc702d74 don't run debootstrap --resolve-deps, probably unneccessary since debian-cd
has a resolver. Also very slow as it downloads Packages files.
2005-09-14 19:36:04 +00:00
Joey Hess 8e07699df8 or was it this way? 2005-09-14 19:07:17 +00:00
Joey Hess 30079de275 or maybe this way? 2005-09-14 19:06:27 +00:00
Joey Hess 16967915ae fix path definition 2005-09-14 19:05:01 +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 f095d8a3fe * Don't hardcode the path to debootstrap. And assume there is a debootstrap
available, as it is a dependency.
2005-09-14 18:21:31 +00:00
Joey Hess 34df7ddf4e fix sid symlinks, and begin versioning in svn 2005-09-07 15:21:11 +00:00
Steve McIntyre 53ba809aaa We no longer need to use md5sum.textutils, as dpkg no longer ships a
non-64-clean version. We can now just use plain "md5sum". (#313613)
2005-07-30 00:13:17 +00:00
Steve McIntyre a809e2abdc Added tools/sarge/upgrade-hppa.sh and tools/sarge/upgrade-sparc.sh to
install the upgrade-kernel bits on CD#1
2005-06-05 01:21:39 +00:00
Santiago Garcia Mantinan 90f70662a9 Couple of small fixes for joeyh's and my latest commits. 2005-05-18 21:45:47 +00:00
Santiago Garcia Mantinan 4cf8c8ca37 Make the jigdos use the same naming scheme as the isos. 2005-05-17 10:10:15 +00:00
Joey Hess 14988d1047 Add etch stuff. Mostly copied unchanged from sarge, with light edits.
Only enable the rescue isolinux targets for etch.

I hope at least some of the etch stuff (like tools/boot/etch) can be used
for the daily CD builds that build using d-i daily builds.
2005-05-05 16:15:44 +00:00
Steve McIntyre babd95c54b Count the total number of binary and source discs better; sarge can
have more than 9 CDs, so ?.packages doesn't cut it any more.
2005-04-24 20:46:06 +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
Steve McIntyre 9c619305e7 Sarge is going to have more than 9 CDs; make sure we clean up all of
the working dirs.
2004-08-18 17:07:28 +00:00
Joey Hess 285cb363a5 - Exclude kernel sources from popcon results, old data skews this badly.
- Remove old kernel sources from interesting-fromcd23, and various other
      removals and updates.
    - Update the task lists and popcon again.
    - Stop excluding 686 and 686-smp kernels, as these are probably the most
      popular, and they fit on CD#1 now.
2004-08-12 03:57:24 +00:00
Joey Hess 87b13e8e49 catch by pere 2004-07-11 21:50:41 +00:00
Joey Hess 787a8a30b1 - Add new default udeb_include files (for to full CDs and DVDs) that
include ethdetect and netcfg, to make network configuration happen in
      first stage, since the second stage cannot currently do any.
2004-07-11 21:34:25 +00:00
Petter Reinholdtsen c2bd5f1e8d Avoid illegal dash (-) in cpp architecture defines. Patch from Colin Watson. 2004-07-11 09:44:00 +00:00
Petter Reinholdtsen ae64f372b5 Use DI_CODENAME to locate the installation system. This make it
possible to use debian-installer with Woody CDs.
2004-07-11 09:34:59 +00:00
Petter Reinholdtsen b2952ee6d4 Report what is going on when cleaning the target directories. 2004-07-09 23:07:11 +00:00
Joey Hess 2241a12613 funky quoting to prevent cvs from expanding $$Date$$ in the Makefile 2004-06-29 23:24:57 +00:00
Joey Hess e150f621b3 clean up 2004-06-29 22:41:38 +00:00
Joey Hess 4167ac3889 Add update-popcon Makefile target (taken from Skolelinux). 2004-06-29 22:21:28 +00:00
Petter Reinholdtsen 8df4cb3349 Try to create $(OUT) instead of just bailing out if it is missing. 2004-06-24 09:41:22 +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
Santiago Garcia Mantinan 456ea7e25b - Fix the dirty workaround bug that was adding debs to businesscards.
- Add 2.6 support to powerpc cds.
 - Add yaboot to powerpc netinst cds as debootstrap no longer adds it.
 - Update boot-sparc not to depend on a kernel version.
 - Update debian-installer tasks once again.
2004-06-07 09:35:40 +00:00
Otavio Salvador 42f052f0c1 Fix preprocess of exclude files when EXCLUDE is not set. 2004-05-12 18:19:27 +00:00
Otavio Salvador 9434b3bf85 Check if the missing debootstrap-required is not included on base_exclude. 2004-05-05 18:46:02 +00:00
Otavio Salvador a279c2ed9c Preprocess exclude files much like tasks files are. Closes: #247379 2004-05-04 21:57:10 +00:00
Santiago Garcia Mantinan 11f1d4904d Add dirty temporal workaround for saving space on netinst images.
The workaround consists in some hints added to rawlist so that the
dependencies are satisfied in a more clever way than list2cds does.
This should be fixed in a proper way on list2cds when time permits.
2004-04-21 20:17:53 +00:00
Raphaël Hertzog 5be9dc670b - Remove debian-keyring.tar.gz from doc dir.
- Don't include Contents-$ARCH.gz on netinst/businesscard CDs.
2004-03-25 06:35:36 +00:00
Joey Hess 68ad503b3f - Revamped the README.html, removing the old manual apt setup
instructions, various references to woody, fixing the link to the LDP
      home page, dropping reference to the basically dead non-us section,
      removing confusing references to non-free being on the CD, dropping
      references to dselect, etc.
    - Fix layout of README.txt, adding missing <p>'s after headings.
    - Drop README.mirrors and README.non-US from the CDs.
2004-03-20 18:01:14 +00:00
Santiago Garcia Mantinan 075eaf8b11 Make Makefile remove dedication files except for current version.
Update debian-installer.* tasks
Add hppa kernels to generate_di+k_list
Add sarge boot scripts for hppa
2004-03-16 09:51:53 +00:00
Joey Hess 41b4701375 - Remove console-keymaps from all udeb_includes; they are included
on the cdrom initrds.
    - Switch from netcfg-static/dhcp to just netcfg.
    - Split udeb_includes for businesscard and netinst; netinst does not
      need choose-mirror, while businesscard does.
2003-12-26 19:23:36 +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
Josip Rodin 6be365149c add a CONF.sh hint into the undefined errors 2003-09-10 11:32:17 +00:00
Josip Rodin 70a4683a13 ignore rm --force failure? i think not. 2003-07-30 13:26:55 +00:00
Josip Rodin 227649a46c do error reporting properly, silly 2003-07-28 21:19:56 +00:00
Josip Rodin 38ceb03c5e conditionalize the BOOTDISKS stuff better 2003-07-24 17:41:53 +00:00
Josip Rodin 9c1ef2ee68 removed some obsoleted stuff and added one new file, README.html (would get overwritten below, but for clarity) 2003-07-24 15:37:46 +00:00
Alastair McKinstry 705f626c10 Ensure that the correct console-keymaps-* files are included
in netinst installs.
2003-05-15 20:08:51 +00:00
Raphaël Hertzog 0e25c9d6b3 - Updated for proper .disk/udeb_include support by default. 2003-05-07 18:06:52 +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 cc10aa6639 - Use readlink instead of ugly "ls -l | awk" ... 2003-02-04 20:40:03 +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
Philip Hands 72dd0f11b9 move the bit that strips the "CD" out of $DISK, so that it is consistent
across the whole for loop (was causing attempts to access .../CDCD1/... etc)
2002-12-20 01:37:55 +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 dd8a0ea81b Create cdrom/.disk/base_components used by debian-installer. 2002-12-14 13:47:01 +00:00
Raphaël Hertzog eb8fa69045 * Make bootable doesn't complain when a boot-$arch script is missing if IGNORE_MISSING_BOOT_SCRIPT is set. 2002-10-13 20:08:06 +00:00
Raphaël Hertzog 270fb96547 * Yet another stupid mistake (s/done/fi/). 2002-10-11 09:53:11 +00:00
Raphaël Hertzog ad275da746 * Fixes when disks-$ARCH is missing as is the case currently with sarge.
* Manages new debian-faq.en.html.tar.gz (instead of debian-faq.html.tar.gz)
2002-10-11 09:46:54 +00:00
Raphaël Hertzog 5ddbb8223c * Added support for sarge and debian-installer. 2002-10-10 12:56:48 +00:00
Tollef Fog Heen cb3dcbedaa Fix extra semicolon typo. 2002-07-12 06:39:13 +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
Santiago Garcia Mantinan c406b16046 Change the way to insert the [Image] section on jigdos so that jigdo-file
generates the md5sum of the template and adds it to the [Image] section.
A side efect is that the generation date apearing on the Info changes from
being the end date to being the start date. If this matters tell me and
I'll change it.
2002-07-03 12:01:50 +00:00
Philip Hands 087f4dfb0b Check for non-us, rather than non-us/main when selecting non-US packages
since a few packages are (wrongly) in section non-us, and therefore not
being forced onto CD#1, which results in other $N_NONUS being created.
2002-07-01 18:25:08 +00:00
Santiago Garcia Mantinan ceeee3561f Retrying to commit the removal of Contents files from jigdofilelist.
It did not commit on the previous run.
2002-07-01 17:56:15 +00:00
Santiago Garcia Mantinan e5073af142 Remove jigdofilelist on distclean.
Fixes a problem with "one arch at a time" mirrors.
2002-06-25 13:42:23 +00:00
Santiago Garcia Mantinan 84e79fdd29 Fixes related to jigdo:
- ARCH dependant thingy
  - upgraded to cope with jigdo 0.6.3 and later template file
    format (thanks Richard)
2002-06-25 08:36:08 +00:00
Raphaël Hertzog d926f4fd93 * Updated tools/add_secured to work with all versions of md5sum
(including the one that comes with dpkg >= 1.10).
* Protect the call to add_secured by a stamp file. Closes: #147105
* Provide a customised isolinux image. We don't need to
  recommend syslinux now.
2002-05-15 21:32:02 +00:00
Philip Hands f3edfa9f2e Add some terms to the find used by jigdo to scan the archive, in order
to make it prefer files from the current distro.
This stops it using paths that point into potato for files that exist in
both potato & woody
2002-05-06 10:30:01 +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 ca93745a86 * Applied patch for #145318.
* Updated README.sbm.
2002-05-04 13:25:03 +00:00
Raphaël Hertzog 26ac1136ec * Fix if/else nesting for debootstrap checks. 2002-04-23 21:30:51 +00:00
Raphaël Hertzog a10af8aa52 * Hardcode debootstrap path ... since /usr/sbin may not be out of the PATH.
* Print results of debootstrap checks.
2002-04-23 13:33:37 +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
Santiago Garcia Mantinan dcf92f2ded Fix jigdofilelist when unstable is not available.
Allow disks-alpha/current not to be a symlink.
2002-03-13 22:40:14 +00:00
Raphaël Hertzog f150eabdff * First fix for the creation of .disk/kernel_installable.
* Added the corresponding changelog entry.
2002-03-02 19:45:24 +00:00
Raphaël Hertzog f8c0ab436e * Implement the .disk/{kernel,base}_installable stuff. Not tested yet. 2002-03-02 19:08:18 +00:00
Raphaël Hertzog 1c13f2a59e * Oops, forgot a -r in the rm call. 2002-02-13 11:16:56 +00:00
Raphaël Hertzog 54ddadb413 * Don't include basedeb-images-* on the CD. 2002-02-13 10:25:02 +00:00
Raphaël Hertzog e14b741797 * Fixed Makefile.
* Updated boot-i386 for bf 3.0.19.
2002-02-11 14:04:08 +00:00
Raphaël Hertzog bb20429165 * Automatically add packages listed by debootstrap. 2002-02-04 14:09:13 +00:00
Anne Bezemer b7582144e3 Add jigdo generation support 2002-01-28 23:00:17 +00:00
Raphaël Hertzog 2e178a4a23 * Fix some cpp related problem. 2002-01-13 18:05:57 +00:00