Commit Graph

1190 Commits

Author SHA1 Message Date
Steve McIntyre e55f885357 Include kbd on first CD rather than console-tools. Closes: #514654 2010-10-03 00:23:46 +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 9210fca346 Include the wpasupplicant package on netinsts and larger. Closes: #593914 2010-09-19 21:14:12 +00:00
Steve McIntyre 4a56e9cf12 Finish refactoring, and make x86 CDs bootable again. Oops 2010-09-18 00:56:54 +00:00
Steve McIntyre a24fa2e1c5 More tweaks for the kFreeBSD boot code: move boot files into boot$N 2010-09-15 12:16:35 +00:00
Steve McIntyre 214f685fa3 Include the acpi package for all x86 media types. Closes: #475243 2010-09-15 09:52:48 +00:00
Steve McIntyre 9fef487e9d * Fix support for alternative boot splash images. Thanks to Tony Awtrey
for the patch. Closes: #537368
2010-09-14 22:49:12 +00:00
Steve McIntyre 22bdd161f8 Remove old mention of different boot methods for CD1 and CD2; we've
not supported the alternative CD2 boot in *ages*.
2010-09-14 22:28:53 +00:00
Steve McIntyre 7bd5c98491 * On release builds, use the full version number including all the dots
(e.g. 6.0.0 for the squeeze release instead of 600).
2010-09-14 20:23:12 +00:00
Steve McIntyre 6752a1634a * Update loadlin kernel parameters to match d-i values. Thanks to Samuel
Thibault for the patch. Closes: #594267
2010-09-14 12:30:05 +00:00
cd-builder user 70f52017d3 Tweak definitions for kfreebsd daily image locations again 2010-08-20 15:58:15 +00:00
cd-builder user c67c31fc03 Tweak definitions for daily image locations so that the push_di_to_cdbuild script can find them 2010-08-20 15:52:56 +00:00
Steve McIntyre 771f754516 Add support for the kfreebsd ports. Closes: #593629 2010-08-20 15:04:23 +00:00
Steve McIntyre 17d3e1088d * Only include a symlink for the suite actually specified in the
Release file. Closes: #590993
2010-08-01 20:43:23 +00:00
cd-builder user 2b26169add make sure FORCE_FIRMWARE has a value for use in README.html.in 2010-07-08 10:34:09 +00:00
cd-builder user 5018528099 Fix for the doppelganger patch 2010-07-08 10:23:51 +00:00
Steve McIntyre b5ec72640c Patch from Ian Campbell <ijc@hellion.org.uk>:
Detect duplicates in the extra images used for installation

Several files included under install.{386,amd} are actually identical to
others. Rather than duplicating them attempt to detect this and hardlink
them.

Since images can be downloaded from the web at build time it is not
always possible to detect identical files by looking for the symlinks
created by the debian-installer build. Instead we pass a list of
potential "doppelgangers" to extra_image each of which is checked for
similarity to the new image.

I added gtk/vmlinuz (which is always the same as plain vmlinuz) which
although not necessary makes it more explicit which kernel goes with the
initrd at very little cost.

Hardlinks are used in preference to symlinks since these are expected to
work better with isolinux and the Xen tools.
2010-07-07 23:49:46 +00:00
cd-builder user 6b44b8cdc1 make imagesums less verbose by default 2010-07-05 14:09:23 +00:00
Steve McIntyre 7f32c206e3 When generating both iso and jigdo files, make sure that the iso files
are at least as new as the jigdo files, as this helps people
mirroring. Closes: #587774
2010-07-02 22:43:46 +00:00
Steve McIntyre 880875a3e4 fix indentation 2010-07-02 22:15:21 +00:00
cd-builder user 370193149e More changes needed for the netinst including firmware. Set up build "C" to work the same as build "2" in most respects. 2010-05-27 13:33:26 +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 5aae598b3d Re-enable larger checksums 2010-05-22 00:36:00 +00:00
Steve McIntyre 27d2d9200f Rename log.add_packages to add_packages.log 2010-04-27 12:27:03 +00:00
Steve McIntyre f5f5b8b4a7 Rename log.sort_deps* to sort_deps*.log for better consistency.
Closes: #571591
2010-04-27 12:25:41 +00:00
Frans Pop 67df0a34b0 Include pciutils on installation CDs
It now gets apt-installed by hw-detect.
2010-03-14 07:26:15 +00:00
Frans Pop a06dd3d59f generate_d-i+k_list: no need to explicitly include module-init-tools
It's priority important.
2010-02-22 00:12:54 +00:00
Frans Pop 7acf834acb generate_d-i+k_list: include grub-legacy inctead of grub
The package grub is now an empty package provided by grub-legacy.
2010-02-22 00:12:47 +00:00
Frans Pop 5d791523af generate_d-i+k_list: drop discover as it's no longer used anywhere
It already wasn't used anymore for device detection and starting with
Lenny it's also not used for X.Org anymore.
2010-02-22 00:12:36 +00:00
Frans Pop 8a76e133a9 generate_d-i+k_list: libsysfs2 workaround is no longer needed
As the Provides was dropped in the udeb in Lenny, the package no longer
needs to be included explicitly.
2010-02-22 00:12:28 +00:00
Steve McIntyre 599ee0710b * Cope with errors reported from debootstrap better; don't just treat
the text output as package names. Closes: #570474
2010-02-21 22:38:03 +00:00
Steve McIntyre acf3d69328 Extend the code that copes with too-large binary packages to cope with
too-large source packages too.
2009-12-29 01:27:25 +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 d961fb7e0e s390: specify offset and size of the initrd for booting from CD
The old setup worked fine with an ext2 initrd but fails with an initramfs,
either because autodetection is different for initramfs or because of kernel
changes (I suspect the first).
This means that booting s390 from CD has not worked since sometime during the
Etch release cycle, even though support for booting from CD was only added
early in that cycle - ouch.

For booting with an initramfs initrd we apparently need to specify its
offset and size at specific memory locations.

Change is based on SuSE's CD boot. Many thanks to Adam Thornton, Mark Post
(of Novell) and Bastian Blank for providing the pointers to the missing bits.

This fixes booting from CD using the d390.ins file; tested in Hercules for
both Lenny (31-bit kernel) and Squeeze (64-bit kernel).
Booting from CD using the d390.tdf file may still be broken (if possible at
all) as I have no idea how to test that.
2009-10-11 18:12:06 +00:00
Raphaël Hertzog d12d861d0d Fix syntax errors in tools/boot/{lenny,squeeze}/boot-m68k (thanks to
lintian).
2009-09-17 14:16:21 +00:00
Steve McIntyre 64be1ae992 re-add scansources.old and scanpackages.old; needed for update-cd 2009-09-02 21:25:50 +00:00
Frans Pop d94e5eecbc The indices directory is no longer required on the mirror
Debian-cd no longer uses the override files, so the indices directory
is no longer required.
2009-08-29 15:24:30 +00:00
Frans Pop 7b419d36a6 Remove obsolete tools from package
If people still want them, they're available in earlier branches
2009-08-29 15:24:24 +00:00
Steve McIntyre cb1a22e63d fix comment bug 2009-08-23 11:01:55 +00:00
Frans Pop 07d571bebb Add console-setup to packages needed for D-I 2009-08-23 07:03:42 +00:00
cd-builder user 897bc3af44 Fix invocation of cpp so that firmware-linux makes it into the firmware image 2009-08-18 22:52:02 +00:00
Raphaël Hertzog d8a3faa32f * Fallback looking for syslinux/silo/yaboot in $CODENAME when $DI_CODENAME
didn't gave any result. This is useful when using partial mirrors built by
  simple-cdd while trying to build a Debian CD using a newer d-i (in my case
  etch CD with lenny d-i).
* Use dpkg --fsys-tarfile instead of ar for extracting files from deb
  packages. The previous invocation could have failed for packages using
  something other than gzip compression.
2009-08-18 15:01:25 +00:00
Frans Pop c967349160 Recognise and ignore Enhances: lines
Patch from Ian Campbell.

It seems that "apt-cache depends" recently (as of 0.7.22) started
including Enhances lines in its output. Leading to:

 Generating dependency tree with apt-cache depends...
        UNEXPECTED: Line `  Enhances: kvm
        ' while parsing end of deptree from 'kvm-source'
        [etc....]

Ignore these lines.
2009-08-09 14:50:38 +00:00
Frans Pop fe2334131d Add a Xen variant on i386 and amd64
Patch from Ian Campbell.

i386 Xen guests require a PAE (686-bigmem) kernel in order to
run. Therefore this variant includes the relevant installer kernel and
ramdisk in install.386/xen as well as suitable kernel udebs and proper
debs for the installed system.

amd64 Xen has no similar requirement but we include the kernels under
install.amd/xen in order to have a consistent path under both
architectures.
2009-08-09 14:33:00 +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 bee30ee646 boot-x86: move creation of install.bat out of extra_image
Patch from Ian Campbell.
2009-08-09 14:32:45 +00:00
Frans Pop 276bf8f8ac Don't fetch D-I images for the prep subarchitecture
prep has not been available for a long time.
Thanks to Ian Campbell for pointing that out.
2009-08-07 10:34:15 +00:00
Frans Pop 129713f1b2 Fix syntax error 2009-08-07 10:34:11 +00:00
Steve McIntyre 16525fc87c * Remove bashism in tools/apt-selection. Closes: #530972 2009-08-04 21:55:03 +00:00
Frans Pop 83fcacb0f7 Don't download floppy D-I images for i386; they're no longer available 2009-08-04 20:34:23 +00:00
Frans Pop ed19bfa438 Avoid unnecessary download of D-I images for x86 and alpha
Only do boot disk stuff for x86 and alpha if the image is supposed to be
bootable. For i386 and amd64 this avoids downloading D-I images for all
30+ CDs in a full set.
2009-08-04 20:15:32 +00:00
Frans Pop c6e842e393 Display message for unsupported sparc subarchitectures 2009-06-13 14:52:42 +00:00
Frans Pop fc09043feb Better do an explicit check for D-I syslinux config version 2009-05-31 23:53:55 +00:00
Frans Pop 617497fff0 x86: fail build if old syslinux config is detected 2009-05-31 22:45:12 +00:00
Frans Pop ce3806e8af Split out code for workaround for #505243 to x86-desktop function library
Cleans up the main boot-x86 script a bit.
2009-05-31 22:45:09 +00:00
Frans Pop d15cc10746 x86: update syslinux config manipulation for version 2.0
Adjust x86 boot scripts for new version (2.0) of framework in D-I for
creation of syslinux configuration files. Essentially the new version
is a backport of what was already implemented in debian-cd before the
release of Lenny and allows a significant simplification.

There are no significant changes in generated CD/DVD images.
2009-05-31 22:45:05 +00:00
Steve McIntyre d5479c0814 Re-add code to generate install.bat on x86 machines. Thanks to Samuel Thibault
for the patch. Closes: #518807
2009-05-16 19:57:17 +00:00
Steve McIntyre 699e6b7e62 fix perl warnings in remove_entry() 2009-05-16 13:54:24 +00:00
Steve McIntyre afd7a7a557 Recognise and ignore Breaks: lines. Closes: #523444 2009-05-16 13:48:49 +00:00
Steve McIntyre b99932aa56 disable the larger checksums for now 2009-05-11 00:07:40 +00:00
Steve McIntyre 1203b68413 make the lookup details case-insensitive 2009-05-11 00:05:56 +00:00
Steve McIntyre 5dd663686e tools/imagesums: Add support for more checksum types. genisoimage
will shortly start generating sha256 and sha512 sums too.
2009-05-10 23:12:52 +00:00
Luk Claes c875c30056 ia64 dailies moved to d-i.d.o 2009-05-05 21:50:23 +00:00
cd-builder user 5e62e91e68 Re-disable mipsel bootable cd code: it's just failing solidly 2009-04-27 16:14:45 +00:00
Luk Claes ef8a3fd518 Update powerpc dailies to the d-i.debian.org ones 2009-04-26 16:42:22 +00:00
Frans Pop d0bd2117be boot-x86 gets sourced: remove shebang; improve whitespace consistency 2009-04-20 12:11:27 +00:00
Frans Pop 0bf1b210cd boot-x86 gets sourced: remove shebang; improve whitespace consistency 2009-04-20 11:50:42 +00:00
Luk Claes b9730d6ab1 use general path as specific one seems to fail 2009-04-08 20:28:52 +00:00
Steve McIntyre 799a06f4c2 Cope with changes to d-i daily-build mirroring 2009-04-07 23:31:03 +00:00
Luk Claes 2c0136b79f hppa dailies moved to d-i.debian.org 2009-04-07 18:07:04 +00:00
Luk Claes 396633af06 Reenable mipsel with ok from Sledge to find out if it works 2009-04-07 13:52:51 +00:00
Luk Claes 7a2d35f38c Moved some images to d-i.debian.org. 2009-04-07 13:43:59 +00:00
Steve McIntyre 564d89c966 Sort dependencies better: if A dep B then we should NOT list A before
B. Closes: #518145.
2009-04-02 12:19:03 +00:00
Colin Watson e08830966d Luk Claes has taken over alpha, amd64, mips, and mipsel daily d-i
builds.
2009-03-26 01:54:41 +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
cd-builder user 5b0f11df38 s/etch/lenny/ 2009-02-14 12:20:28 +00:00
Steve McIntyre 132bae8583 Re-add the tools directory on amd64 and i386 disc #1 2009-02-14 12:16:11 +00:00
Steve McIntyre 60c1387960 Improved handling of in tools/update_tasks 2009-02-12 14:16:45 +00:00
Steve McIntyre cd5a1d2c90 * Merge patches from Jonathan Hall:
+ Add better support for extra components, improve non-i386 mirror
    support (Closes: 514237)
  + tools/update_tasks no longer assumes i386 for all builds (Closes: #513497)
  + tools/which_deb no longer assumes i386 for all builds (Closes: #513498)
* For source-only builds, don't do any task updates as they're not
  useful anyway.
* Last high-urgency upload, ready for Lenny!
2009-02-12 00:22:17 +00:00
Frans Pop 7f320fed82 x86-desktop.sh: improve comment 2009-01-30 05:00:20 +00:00
Frans Pop 69e3f1fa76 Clean up D-I Lenny RC1 compatibility code 2009-01-30 05:00:16 +00:00
Frans Pop 5032d25183 Drop support for ISOLINUX_DEFAULT
This environment variable was used by simple-cdd to force the default
installation option to the graphical installer. Now that we have the
syslinux VESA menu, the option has become rather pointless.

See #512303 for discussion.
2009-01-30 05:00:09 +00:00
Steve McIntyre 09b01e685a * start_new_disc: fix a typo so that DISC_PKG_HOOK might work. Thanks to
Jonathan Hall for the patch. Closes: #513421
2009-01-29 00:22:15 +00:00
Frans Pop 33ec58d1a5 sparc: ensure the default 'install' option also gets KERNEL_PARAMS set
The current code will add KERNEL_PARAMS only for boot options that have
an existing "append=" line, but that leaves the default option without it.
2009-01-20 00:39:09 +00:00
Frans Pop e045cebd32 Rename Packages-gen.sh to Packages-gen 2009-01-12 15:10:55 +00:00
Frans Pop f889a347da Improve indentation consistency 2008-12-28 13:48:10 +00:00
Frans Pop 7bbc73edec update_tasks: give priority to key packages for secondary tasks
Even for secondary tasks it makes sense to include their Key packages
before their regular packages.
2008-12-28 13:18:09 +00:00
cd-builder user c586d11bcc add support for SUMS. 2008-12-26 01:08:44 +00:00
cd-builder user f6e4a7b16d Add support for extensions to imagesums 2008-12-17 23:34:11 +00:00
Frans Pop df0f50fdd4 update_tasks: fix minor error in regexp 2008-12-05 22:30:18 +00:00
Frans Pop 06ee64bc28 update_tasks: we can now just loop over existing task.list files
To avoid confusion the intermediate task lists are renamed from
task.list.{essential,full} to task.gen.{essential,full}.
2008-12-05 14:12:38 +00:00
Frans Pop 086dc76302 Add suffix "generic" to default task files for naming consistency 2008-12-05 14:12:36 +00:00
Frans Pop dc3927d14c Add support for a separate 'GNOME desktop environment' CD
This new task is mostly added for completeness. Main difference with
the default task file is that no server tasks are included.
2008-12-05 14:12:32 +00:00
Frans Pop 31e8cfd687 Ensure working boot config for light/all desktops for arches other than x86 2008-12-05 14:12:26 +00:00
Frans Pop 2225676ffe Add support to create an 'all desktops' DVD
Include all four desktop environments supported by tasksel (GNOME, KDE,
LXDE and Xfce).

On x86 also add an option in the isolinux menu (under Advanced options)
to select which DE to install; GNOME remains default.
2008-12-05 14:12:24 +00:00
Frans Pop 5b750a3810 Add support for a 'light desktop environment' CD (LXDE + Xfce)
Supports installation of either an xfce or an lxde desktop environment.
For now use B as identifier for INSTALLER_CD in contrib/testingcds.

Includes a framework to manipulate the isolinux configuration for x86 so
that a user can select which desktop he wishes to install.
2008-12-05 14:12:21 +00:00
Frans Pop 7763cff1bd Add support for a separate 'LXDE desktop environment' CD
For now use A as identifier for INSTALLER_CD in contrib/testingcds;
we should probably switch to a double digit scheme post lenny or
even generally rationalize the use of INSTALLER_CD.
2008-12-05 14:12:17 +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
Frans Pop 3e2d5841be Avoid build error when building full set of multi-arch i386/amd64 DVDs 2008-12-05 14:12:04 +00:00
Frans Pop c9c4150758 Don't add 'desktop=' to append line in instsel.cfg 2008-12-05 14:11:58 +00:00
Frans Pop 5d95644996 boot-hppa: stop passing redundant boot parameters
With current initramfs support neither root= nor ramdisk_size= are
needed anymore.
2008-12-05 09:08:23 +00:00
Frans Pop ae69a5b14e boot-hppa: support KERNEL_PARAMS
This is mainly to have the desktop= option passed correctly.
Also switch to space separation in -hppa-cmdline for consistency with
other architectures.
2008-12-05 09:08:20 +00:00
Frans Pop 78905cc873 make_image: avoid code duplication and improve whitespace consistency 2008-12-05 09:08:16 +00:00
Frans Pop b094f77592 make_image: ensure correct quoting of variables when calling genisoimage
By first assembling the command in a variable and then using eval to execute it
we avoid both duplication and errors passing quoted options in $MKISOFS_OPTS.
2008-12-05 09:08:13 +00:00
Steve McIntyre eb58e46871 Fix tab damage from last checkin 2008-11-26 23:42:05 +00:00
Steve McIntyre eabbd6d948 Add more info when reading in package data 2008-11-26 23:37:18 +00:00
Frans Pop 9ed57cc189 Fix x86 m-a breakage in workaround due to file renames 2008-11-26 12:46:58 +00:00
Steve McIntyre 957b00eeff close the input pipe each time when talking to apt 2008-11-24 01:59:16 +00:00
Frans Pop 03adf99b41 Prepare for *text.cfg to *txt.cfg rename by D-I 2008-11-23 21:34:39 +00:00
cd-builder user f8fdeb4c75 Remove old debug 2008-11-23 18:56:30 +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 16f9407423 Prepare for adamd*.cfg to amdad*.cfg rename by D-I 2008-11-23 11:53:57 +00:00
Steve McIntyre 7a6ced3533 Move to perl, and add support for grabbing source details too 2008-11-22 10:46:55 +00:00
Steve McIntyre 91b43114ab Close the list input when we're done with it 2008-11-22 08:38:59 +00:00
cd-builder user 788e133770 Add support for multiple desktop tasks on a single disk 2008-11-22 00:58:51 +00:00
Frans Pop bc419dbf37 Workaround issue with isolinux on amd64/i386 multi-arch images
Modify the syslinux configuration for amd64/i386 multi-arch images
and use ifcpu64.c32 to autodetect 32/64-bit systems when a user hits
enter from the isolinux help screens.

Based on research done and info provided by Franklin Piat.
2008-11-19 16:08:22 +00:00
Steve McIntyre f48c4f3d27 Stop copying the /tools/ directory on from the mirror; it's going away 2008-11-17 23:34:32 +00:00
Frans Pop 262e02ffca Fix i386/amd64 multi-arch support
Currently the isolinux configuration only gets created correctly if the
two arches are specified in the order "amd64 i386". Change the lenny x86
boot script so it works the other way around too.
2008-11-15 01:08:15 +00:00
Frans Pop a8f0d9d14b Remove remaining remnants of pre-split-config support 2008-11-15 01:08:12 +00:00
Frans Pop 88824982ba Fix error in expansion of %ARCH% variables in D-I image location envvars 2008-11-14 20:14: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 1a47dd2a93 Avoid adding an EOL at the end of f3/f4 syslinux help files 2008-11-13 00:23:16 +00:00
Frans Pop e37c9d5a1f Indentation fix 2008-11-13 00:23:14 +00:00
Frans Pop 5beea509c7 Improve code readability 2008-11-12 20:33:42 +00:00
Frans Pop 747426afb6 More no longer needed compatibility code cleanup 2008-11-12 20:33:39 +00:00
Frans Pop bac7536f0f Clean up no longer needed compatibility code in lenny x86 boot script 2008-11-12 18:06:29 +00:00
Raphaël Hertzog 5aa7863d82 Also extract isolinux.bin from the syslinux package in the case of etch
CD images (since it's no more provided by debian-cd itself).
2008-11-07 16:32:06 +00:00
Raphaël Hertzog 7b28512cf9 Don't try to copy sbm on etch CD images as it got removed. 2008-11-07 15:53:36 +00:00
Steve McIntyre d0734e24cc Actually move the file 2008-11-02 09:25:55 +00:00
Steve McIntyre 23f23e05c9 Actually move the file 2008-11-02 09:23:09 +00:00
Steve McIntyre 6853ba25d6 Update update_popcon to cope better with errors; now uses curl instead of wget 2008-11-02 09:20:39 +00:00
Frans Pop 7567a51136 Remove last few references to (raw)list.exclude 2008-11-01 23:11:52 +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 e59ad475b0 Drop brltty from the netinst CDs
brltty has started pulling in libicu, which has a size of 5MB.
An overhead of 5MB is just too big for netinst CD images for a
package that is only needed by a very small group of users and
that will normally also be available from a mirror (brltty gets
installed during finish-install).

For full CDs and DVDs the package will still get included as it's
listed in forcd1.
2008-10-29 14:02:42 +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 9200e82ade Stop including jfbterm unifont on all images
They are no longer installed from D-I as jbfterm was only needed for
base-config and unifont's dependencies have become insane.
Saves 15MB on i386 netinst images.
2008-10-14 11:37:03 +00:00
Frans Pop aec7c50df4 Add easy-build.sh script
A new wrapper script around build.sh that should make it a lot easier
for new users to use debian-cd and to build custom images.
2008-10-14 08:22:03 +00:00
Frans Pop bb9fad3216 Allow multi-arch builds using D-I images from official mirrors or local D-I images
This is made possible by allowing to include a "%ARCH%" placeholder in the
environment variables DI_WWW_HOME and DI_DIR which is expanded to the correct
value at runtime.

Supported for Etch and later.
2008-10-14 08:22:00 +00:00
Frans Pop d48db452d6 Make use of MAXISOS and MAXJIGDOS more consistent 2008-10-14 08:21:57 +00:00
Frans Pop 07a91b45e3 Drop support for building Sarge CDs 2008-10-14 08:02:21 +00:00
Frans Pop 1a0904ab00 Improve temp dir handling 2008-10-12 23:54:01 +00:00
Steve McIntyre 45617b2d30 * Support KERNEL_PARAMS for powerpc, alpha and sparc (Closes: #416230)
Thanks to Vagrant Cascadian for the patch.
2008-10-12 23:30:19 +00:00
cd-builder user dcccd50f85 more cleanup in update_tasks 2008-10-12 23:25:48 +00:00
cd-builder user 59e4f05035 slight cleanup in update_tasks 2008-10-12 23:08:57 +00:00
Frans Pop 9202a3e6e8 Also remove advanced syslinux config files for gtk
Note that AFAICT removing these files is unnecessary as they should not
be included in the tarball if the file f3.txt.withgtk is not present.
2008-09-21 22:02:22 +00:00
Frans Pop 1dd8261809 Update for syslinux config file rename in D-I
The files (ad)amd.cfg were renamed to (ad)amdtext.cfg for consistency.
2008-09-21 22:02:10 +00:00
Frans Pop 704a350c35 Make sure directory to unpack syslinux in exists
Also make indentation consistent
2008-09-18 18:26:14 +00:00
Steve McIntyre 3580191792 Remove all mention of sbm; no longer needed 2008-09-16 15:29:55 +00:00
Steve McIntyre 7a81292e18 Fix silly thinko 2008-09-16 01:40:15 +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
cd-builder user 58a40d32b7 Cope better with source/binary package mismatches 2008-09-10 21:59:32 +00:00
cd-builder user b598c30a47 * Add the "-joliet-long" option when making images with Joliet names.
Some packages with ridiculously long names are not unique in the
    first 64 characters, so normal Joliet sorting fails.
2008-09-08 21:53:45 +00:00
Otavio Salvador 0a1de9d57a Include multipath-tools-boot for all medias. 2008-09-08 17:43:16 +00:00
Otavio Salvador 52918ed9f0 Only include atl2 packages on i386 and amd64 medias since d-i do not use them on all other arches 2008-08-30 00:41:08 +00:00
Otavio Salvador 3c6d87722f * Include packages needed for systems using atl2 network adator.
* Include speakup modules for i386 and amd64 medias.
2008-08-28 23:21:33 +00:00
Frans Pop e24b17a1e7 Add packages needed for systems using loop-aes encryption
Make sure packages (loop-aes-utils and loop-aes kernel modules)
are included on the installation CD in case loop-aes encryption
is used during partitioning.
2008-08-04 17:06:30 +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 787f433fe6 Correct location of images for ia64 2008-07-16 20:02:15 +00:00
Frans Pop 311d0a1273 Daily builds for ia64 have moved 2008-07-16 20:02:11 +00:00
Frans Pop 76dab60727 Daily builds for m68k have moved 2008-07-16 20:02:08 +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
Frans Pop 26e0a2413d Workaround: don't include source for udebs in images
* list2cds: set "Component" for udebs to "debian-installer
* merge_package_lists: skip udebs when including source

When building images for Etch+1/2, which takes regular packages from
stable and udebs from testing, there is a problem when adding source
for udebs as existing code will take source for both debs and udebs
from stable. This can result in either incorrect source being included
(version mismatch) or errors (new udebs for which no match can be found
in the Source.gz file that is used).

A proper solution would require that the debian-installer section gets
its own Sources.gz file, but that is currently just not available.
After trying some things the conclusion was that the best solution for
now is to just not include source for udebs at all.

Patch written by Steve McIntyre.
2008-07-13 11:33:35 +00:00
Frans Pop 0ae829d756 Add sanity check for data passed to add_packages 2008-07-13 11:33:14 +00:00
Steve McIntyre fe768847b1 swap tabs to spaces 2008-07-06 21:08:21 +00:00
Steve McIntyre 03305d23f2 Fix bashism in tools/grab_md5. Closes: #489562 2008-07-06 21:01:18 +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
Steve McIntyre 50b9093086 Updated code. Parse tasks/firmware to get the list of firmware
packages wanted, then grab the package file names from the Packages.gz
files in the appropriate release.
2008-06-25 00:24:09 +00:00
Steve McIntyre 68b3e63cfa minor update 2008-06-23 21:57:37 +00:00
Steve McIntyre 3a29fb0a8b Initial cut of make-firmware-image, a simple script to create .tar.gz
and .zip files containing non-free firmware and microcode packages.
2008-06-23 21:55:36 +00:00
Steve McIntyre b4fd0dfd9b use isolinux rather than 2008-06-08 22:32:11 +00:00
Steve McIntyre 55bd8d23b1 better anchor for search 2008-06-08 22:17:30 +00:00
Steve McIntyre 83ac3d95a3 Add support for custom kernel params for all isolinux configurations 2008-06-08 22:13:42 +00:00
Steve McIntyre 09dab01bb4 Change match order 2008-06-07 19:31:29 +00:00
Steve McIntyre 9c027571ba Move update_tasks to using mawk rather than gawk. It's *much*
faster. Needs some slight changes in regular expression handling, but
nothing major.
2008-06-07 19:03:45 +00:00
Steve McIntyre e97909abee Move away from grep-dctrl. New code in awk is slightly faster, and
more robust in cases where tasks are not defined.
2008-06-07 17:03:44 +00:00
Steve McIntyre 2b8dfe453a make sure the packages are sorted appropriately 2008-06-07 12:05:08 +00:00
Steve McIntyre 6a65e48806 re-indent for consistency 2008-06-07 00:31:58 +00:00
Steve McIntyre c5e871279b re-add set -e 2008-06-07 00:27:20 +00:00
Steve McIntyre d21aa49a4f * tools/update_tasks: Significant streamlining to make a huge difference in
runtime. Now feasible to run this automatically per-build rather than
    cronning it.
2008-06-07 00:02:36 +00:00
Joey Hess 977746d1c1 Path to sparc daily builds has changed. 2008-06-05 22:45:11 +00:00
Frans Pop 6d8c7bfc94 generate_di+k_list: fix logic error in use of codenames
When building a CD for e.g. etch using D-I from e.g. sid, the script should
not update debian-installer+kernel-sid but debian-installer+kernel-etch in
tasks. After all, debian-installer+kernel-* contains normal packages, and
not udebs. With this change we no longer have to modify the Debian_<codename>
tasks in such cases.
The generated file should of course have '#include <debian-installer-sid>'.
2008-05-17 16:18:04 +00:00
Frans Pop a3f50b9717 Revert accidentally committed files 2008-05-04 18:01:58 +00:00
Frans Pop 3146f1e1fe Drop the base-{etch,lenny} tasks files as make_disc_trees.pl already take
care of including packages needed by debootstrap.
2008-05-04 17:56:56 +00:00
Santiago Garcia Mantinan c580e320e8 Start to add armel support. 2008-05-04 17:38:52 +00:00
Joey Hess f91df1f669 Add support for a split syslinux.cfg file, which will later be provided
to support the syslinux vesa menu.
2008-05-01 20:52:03 +00:00
Steve McIntyre 7c095e5768 Fix code that removes Packages entries - need to be paragraph-oriented rather than line-oriented here 2008-04-20 15:31:48 +00:00
Steve McIntyre 72fad7783b * tools/imagesums: use newer features in latest mkisofs/genisoimage to grab
pre-calculated MD5 and SHA1 checksums directly from the jigdo file.
2008-04-20 14:33:19 +00:00
Frans Pop 542d5891ad Revert accidentally committed files 2008-04-11 18:31:44 +00:00
Frans Pop c5cafa1fac Remove wireless-tools-udeb from the lenny udeb_include files as it is not
required for wireless support (see also #474708).
2008-04-11 18:23:46 +00:00
Steve McIntyre 8ced9d59fc Disable the other m68k option 2008-04-01 23:12:40 +00:00
Steve McIntyre 5747f296cb Temporarily disable boot support on problematic arches 2008-03-31 13:04:42 +00:00
Steve McIntyre f9ca2237ff Re-split link.pl code out; add_files needs it too 2008-03-24 15:08:58 +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
Frans Pop 899e449533 Revert accidental commit of new file 2008-03-07 09:29:01 +00:00
Frans Pop 559ba5615c Ensure that the correct version of the Installation Guide is included 2008-03-07 09:27:39 +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
Steve McIntyre 5498cc1e5b * Temporarily disable boot support for arm CDs - the netwinder images are not
being produced at the moment.
2008-03-05 00:14:25 +00:00
Steve McIntyre 09ed2f2196 Fix a bug in start_new_disc - cope with MAXCDS not being set. 2008-03-05 00:04:36 +00:00
Otavio Salvador 35c6eec04a * Make sure we include grub-pc since it's used when GPT disk label is
choosen.
2008-02-14 14:27:03 +00:00
Otavio Salvador b08293c62d force including of laptop-detect on first CD
Make sure we include laptop-detect on arches that are know to have
laptops. This is currently done for i386, amd64 and powerpc.
2008-02-11 12:58:46 +00:00
Frans Pop a8beab40a3 * start_new_disc: make multi-arch CD/DVDs and CD/DVDs that are not part of a
set (e.g. KDE/Xfce CDs) recognizable through info in .disk directory.
2008-01-16 17:04:13 +00:00
Steve McIntyre 4c2837c737 * Significant cleanup of list2cds. Closes: #451237 2008-01-11 01:04:28 +00:00
Frans Pop eeb3b9abfc Use 'or' instead of '||' when testing result of calls to open (because of precendence rules) 2008-01-05 23:53:27 +00:00
Frans Pop 0db7484988 * During installation debootstrap will complain about an invalid Release file
if there is no Packages file for the local section. Create an empty Packages
  file if one is missing.
2008-01-05 23:50:48 +00:00
Frans Pop a6e1349b01 Minor consistency fix 2008-01-04 23:01:05 +00:00
Frans Pop d07d0ac8af * Instead of including all alternative dependencies in list2cds, only
include the first one. This reduces the size of the netinst and improves
  what's included on CD1. Only loss is console-{data,common,tools} so these
  are now added in generate_di+k_list.
2008-01-02 21:06:24 +00:00
Frans Pop acc04558ee * tools/update_tasks: ignore comments and blank lines in tasks.list.
* tasks/tasks.list
  - add missing l10n tasks: gujarati-desktop, malayalam-desktop, tamil
  - comment out l10n tasks for languages not supported in D-I, for
    Icelandic, Irish, Serbian, Welsh and Xhosa
2007-12-17 19:59:42 +00:00
Frans Pop ced27feb2f * Include busybox for architectures that use initramfs-tools; base-installer
will try to install it.
2007-12-13 16:32:39 +00:00
Frans Pop bd1da0c827 * boot-{mipsel,sparc}: Parse website directory index case insensitive so
that both "<a href=" and "<A HREF=" are recognized.
2007-12-12 00:45:02 +00:00
Joey Hess 46a4e3536b * Add acpi-support-base to generate_di+k_list. 2007-11-18 02:39:28 +00:00
Otavio Salvador 5f4cdb823e Revert the #410418 since it breaks too many things and to add it major changes will be required, not adding them now 2007-10-30 19:31:19 +00:00
Steve McIntyre d570bf3ad3 Add the missing ; 2007-10-30 00:56:16 +00:00
Otavio Salvador 8f92855bb7 Fix regressions found on r1475 walking on the queued packages twice 2007-10-29 22:58:25 +00:00
Otavio Salvador 35ef242061 Revert r1475 since it caused regressions. Will get back to it once time permits 2007-10-23 21:08:12 +00:00
Otavio Salvador e0213e29ca * Exclude packages and add all task present ones before resolve
dependencies, avoiding OR dependencies to take their place and removed
  packages dependencies to be included. Closes: #410418.
2007-09-28 18:41:02 +00:00
Joey Hess c569885764 * Include dmraid deb. Closes: #443991 2007-09-27 17:46:00 +00:00
Steve McIntyre 0cc7cac700 Don't fail if there are no CSS files or image files in data/${CODENAME} 2007-09-26 19:02:26 +00:00
Steve McIntyre 66e79adda2 a new look for README.html - CSS and new graphics 2007-09-25 16:08:49 +00:00
Steve McIntyre 921d112d91 Try again to make lenny/sid i386 builds work again 2007-09-18 09:48:49 +00:00
Steve McIntyre c81d64da56 * Make daily i386/amd64 lenny builds work again - don't attempt to copy
the win32-loader files into place if they don't exist.
2007-09-17 10:52:03 +00:00
Otavio Salvador f2026f7c5f * Fix autorun.inf generation when win32-loader is present. 2007-09-13 18:28:21 +00:00
Otavio Salvador 8a0984b325 * Applied patch from Robert Millan <rmh@aybabtu.com> to use win32-loader
for autorun when CD is being used on Windows. Closes: #441846.
2007-09-12 16:31:27 +00:00
Joey Hess 23f2e94046 fix bashism 2007-09-10 18:10:16 +00:00
Otavio Salvador ee4fab7ef8 * Applied patch from Robert Millan <rmh@aybabtu.com> to fix image
generation with read-only mirrors. Closes: #441397.
2007-09-10 17:48:38 +00:00
Otavio Salvador fbdb7b30fd * Applied patch from Robert Millan <rmh@aybabtu.com> to integrate
win32-loader. Closes: #440220.
2007-09-10 17:47:16 +00:00
Frans Pop 12d15c1a2a At least somewhat more consistent indentation... 2007-09-02 17:24:04 +00:00
Frans Pop 08f297d554 * Disable debugging output in boot scripts. 2007-09-02 17:18:06 +00:00
Steve McIntyre dd8d42703b * Check if required base packages might also be supplied by a local
repository too, not just the main distribution. Closes: #425600
2007-08-26 15:19:00 +00:00
Steve McIntyre a10d15179c * Recompress the Packages files separately just before generating
Release files. Closes: #423835, thanks to fjp for the patch.
2007-08-26 15:07:52 +00:00
Steve McIntyre 2996bf0a1e Invert the -e test 2007-08-11 23:23:25 +00:00
Steve McIntyre e53fc89e17 * Temporary fixup for daily lenny sparc builds - use older image locations
if new ones not available.
2007-08-11 12:57:12 +00:00
Steve McIntyre 5655b191d5 Further logic fixing in boot-x86: amd64 should now work 2007-08-10 23:44:14 +00:00
Steve McIntyre c40e37b066 Fix boot-x86 shell syntax so it runs 2007-08-09 21:28:10 +00:00
Steve McIntyre 642626a4be Merged a patch from Otavio:
* Create dpkg status file before calling APT
2007-08-08 12:55:36 +00:00
Steve McIntyre 0454b4c917 Merged in patch from Otavio:
* Fix extranonfree support to be backward compatible with previous
  behaviour (default to false)
2007-08-08 09:54:04 +00:00
Joey Hess 6560eb096d * Merge boot-i386 and boot-amd64 into boot-x86. 2007-08-02 03:47:50 +00:00
Joey Hess 0b03aad504 * Parse isolinux.cfg case-insensatively. 2007-08-02 02:43:19 +00:00
Joey Hess cd50dfba26 * Drop old with26 cruft for lenny. 2007-08-02 02:28:02 +00:00
Petter Reinholdtsen b770dfe6d2 [ Petter Reinholdtsen ]
* Update tools/grab_md5 to use the same variable name (SUITE->CODENAME)
    as the rest of the code, to reduse confusion.
2007-07-30 07:36:39 +00:00
Frans Pop 79c1614a0a Use correct version of boot configuration files 2007-07-26 08:18:52 +00:00
Frans Pop 7a414b8567 Partial reversion, we can always simplify further later 2007-07-26 01:53:36 +00:00
Frans Pop cb5987f544 - Remove support for sparc32
- Structure of D-I images was simplified, so adapt to that
- Fix some broken references to etch in lenny boot-sparc script
- Hope after all this things will still work...
2007-07-26 01:22:33 +00:00
Frans Pop ff146a5d79 Disable sparc32 for Lenny images as it is no longer supported 2007-07-18 07:39:59 +00:00
Steve McIntyre 87b46721b8 Additional HERE command is no longer needed 2007-07-18 02:03:34 +00:00
Frans Pop 03a5813d97 Remove obsolete code to include kernel-image packages for powerpc 2007-07-03 09:29:26 +00:00
Frans Pop 16d9f6aed9 Revert accidental commit of local changes 2007-06-22 17:10:14 +00:00
Frans Pop f096552f3b Fix indentation 2007-06-22 15:18:10 +00:00
Steve McIntyre febd6c144e weird props problem 2007-06-22 14:54:50 +00:00
Steve McIntyre 52ca77be04 * Fix for multi-arch CDs including source - the extranonfree update
broke the source output
2007-06-22 14:49:17 +00:00
Steve McIntyre 8fad42f5fd * Fix for multi-arch CDs including source - the extranonfree update
broke the source output
2007-06-22 14:42:43 +00:00
Steve McIntyre 55fb140b7c Minor update for local support 2007-05-12 01:35:39 +00:00
Steve McIntyre 9c78119a6c Try a more flexible approach for local debs 2007-05-12 01:28:47 +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
Frans Pop fdb006760d Dann Frazier has taken over from Jeff Bailey for daily IA64 D-I builds 2007-05-03 22:00:21 +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
Steve McIntyre 8a277132e8 * Removed m68k from the list of arches in generate_di+k_list and
generate_di_list to reduce warnings.
2007-04-10 23:44:56 +00:00
Frans Pop fff66f0336 - Also export COMPLETE for use in the README file template
- Clean up: remove files for potato and woody release
2007-04-10 23:31:01 +00:00
Steve McIntyre 09e495846f * Copied etch files to lenny ready for the new testing work. 2007-04-10 23:21:31 +00:00
Steve McIntyre fa2c4bcc52 * Add some munging on the Release files if we're not building
for "testing". Used in the etch release, and I'll back it out shortly.
2007-04-07 11:34:51 +00:00
Steve McIntyre ab7e1d0171 In list2cds, don't add udebs in the final COMPLETE run - they're no
use there.
2007-04-06 18:23:14 +00:00
Steve McIntyre b695b182c4 * In start_new_disc, cope with $DEBVERSION containing spaces
* Only put the release notes and installation guide on disc#1
2007-04-04 16:40:18 +00:00
Steve McIntyre 64bd969a0c * Fix up boot-alpha to calculate the size of the ramdisk needed, rather
than hard-coding to 16384. Also slight refactoring.
2007-03-20 01:01:16 +00:00
Steve McIntyre a2d50b9f65 * Fix a silly bug in start_new_disc that would break on discs with
local packages. Thanks to Ronny Aasen for the patch. Closes: #414818
  * Final *final* upload for etch; urgency high to get through the
    freeze.
2007-03-13 23:38:53 +00:00
Steve McIntyre 1fc78c6086 * Fix the extra_image() function in both boot-i386 and boot-amd64 to make
sure we don't end up overwriting extra images from one arch with those
    from the other. Now the multi-arch netinst should work for the installgui
    target for both arches
2007-03-13 02:21:13 +00:00
Steve McIntyre 9006e6dd31 * Add the DEFAULT64 handling to boot-amd64 as well as boot-i386; needed
in both so that things are setup the same regardless of the order in
    which the boot-$arch scripts are called
2007-03-13 01:06:07 +00:00
Steve McIntyre ec87877896 Fix path for creating splash image in boot-amd64. Closes: #413850. 2007-03-12 01:33:39 +00:00
Raphaël Hertzog 46369d0dc5 Disable pattern metacharacters in some regex with included variables.
Closes: #413506
2007-03-05 16:09:46 +00:00
Joey Hess 7b1b3973f8 * Updated isolinux.bin to the version from syslinux 3.31-3.
* Re-enable use of 64 bit detection, fixed now.
2007-03-01 19:18:45 +00:00
Steve McIntyre 2ca98a7f32 * Cope with rolling back more than one package in case we go well
over the disc size
  * Use a multiplier of 1.2 for HFS space - overkill, but it fixes
    the multi-arch DVD overflowing. Also log if we're doing HFS.
  * Tweak where we look for s390 boot files to make the weeklies work again.
2007-02-27 20:05:32 +00:00
Raphaël Hertzog a2d9587f1a Don't rely on PATH containing the tools directory. 2007-02-21 14:13:35 +00:00
Joey Hess f47d23be43 * Temporarily disable use of 64 bit detection due to syslinx's bug #410729. 2007-02-13 01:14:35 +00:00
Joey Hess 3d5259c5ef * Use the 64 bit autodetection feature of syslinux 3.31-2, if available,
to default to the 64 bit target in multiarch isos.
2007-02-04 23:41:44 +00:00
Steve McIntyre 06efc9c4d7 Add debug for when get_file_blocks fails 2007-01-22 23:06:30 +00:00
Steve McIntyre ba8e154a12 * In start_new_disc, make sure that we call the (badly-named) add-bin-doc
so that we get README.html and README.txt created even for source discs.
2007-01-02 01:56:44 +00:00
Steve McIntyre 55f4db876a + Slightly change the output naming of the disc images to make it safer
to produce more then one type of multi-arch disc
2006-12-30 15:13:07 +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 9d376d233e Re-indent add_packages 2006-12-29 05:57:21 +00:00
Steve McIntyre 17bb18194f * Re-implemented exclude/unexclude support in make_disc_trees.pl instead
of in list2cds. Slight changes in semantics - the new code supports
    regular expressions for matching package names (to make it easier to
    exclude groups of related packages), and EXCLUDE<m> should be used in
    preference to EXCLUDE for packages that are just being shifted to
    later in the set by using UNEXCLUDE<n>.
2006-12-29 05:56:43 +00:00
Steve McIntyre 4d4bba1b7e Don't list the md5sum.txt file inside itself, it will always fail 2006-12-29 02:50:35 +00:00
Steve McIntyre 35743cde5f As a last-minute step before building images, fill in the TOTALNUM
value in the README files in the root of each image.
2006-12-29 02:44:22 +00:00
Steve McIntyre cccbdd469f Gunzip the installation manual in .txt and .pdf format, so it's useful
on other platforms too.
2006-12-29 01:48:26 +00:00
Frans Pop 7af2565ecf * Add linux-image-2.6-prep for powerpc. 2006-12-29 01:14:28 +00:00
Steve McIntyre eb1131b3df Make make_disc_trees.pl and start_new_disc fail better on errors 2006-12-23 03:03:58 +00:00
Steve McIntyre 528c0072f2 remove Suggests on delo - we grab and use the correct version direct
from the archive instead these days
2006-12-23 03:02:37 +00:00
Steve McIntyre 342bcac67b don't suggest binutils-multiarch, we haven't needed that for mipsel CDs since woody 2006-12-23 01:17:47 +00:00
Steve McIntyre 37a2704f3b Remove scansources ; no longer used 2006-12-23 00:55:48 +00:00
Steve McIntyre 9ae3366b88 Lose the "|| true" when we call boot-$arch; make sure we fail if it fails... 2006-12-23 00:00:36 +00:00
Steve McIntyre 82aa893404 Minor update to boot-sparc 2006-12-22 14:24:28 +00:00
Steve McIntyre 5f185be61f Removed old "set -x" 2006-12-21 16:19:34 +00:00
Steve McIntyre 4a2a622525 Make the boot scripts more consistent in how they call add_mkisofs_opt 2006-12-21 16:05:32 +00:00
Steve McIntyre 67d9909bbe Make sure the mkisofs options file goes in the right place 2006-12-21 15:27:50 +00:00
Steve McIntyre 77e3c9015c Add extra logic to source-tracking code. If we have more than 1 binary
arch along with source, there's a chance that the different arches may
have refs to a particular binary package (and hence its source) at
completely different points. Rather than just go with the one we find
first (from the first binary ref), make sure that the source will
match up with the earliest binary record, measured across all arches.

As noticed on the multi-arch DVD; make sure that source:kde-i18n makes
it into the package list before amd64:kde-i18n-ar.
2006-12-21 03:45:01 +00:00
Steve McIntyre 74e9050525 rearrange to make sure is set before we set 2006-12-20 11:02:59 +00:00
Steve McIntyre 4bb6ee2bbe Always create an empty mkisofs_dirs file for each image; stop warnings about missing files later when we source them in 2006-12-19 17:15:16 +00:00
Steve McIntyre 61c1630ab1 Cosmetic fix - list source in too in debug 2006-12-19 15:57:15 +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 7b6988d66d Make list2cds more verbose in log output, especially when dependencies have failed so a package can't be added 2006-12-18 13:40:53 +00:00
Steve McIntyre 05905f9e37 Better estimation for HFS media (m68k/ppc) 2006-12-12 02:10:53 +00:00
Steve McIntyre 95ffabb409 * Don't put ppc boot files on discs >1.
* Add more hfs options to m68k discs, to match ppc.
2006-12-12 02:09:34 +00:00
Steve McIntyre ad1906c27b Even more accurate size estimation; reduce how much we need to run mkisofs 2006-12-11 17:52:25 +00:00
Steve McIntyre 8b318a9693 Tweak the size-checking threshold to make things faster 2006-12-11 15:50:49 +00:00
Steve McIntyre 277fc58f3d When rolling back, cope with package names that are not regexp friendly 2006-12-11 15:47:18 +00:00
Steve McIntyre e1116e39e4 typo fix 2006-12-10 22:37:38 +00:00
Steve McIntyre 96608804fc Remove the old shell version of make_disc_trees
Missed changing one of the invocations of add_packages - now fixed
2006-12-10 22:36:08 +00:00
Steve McIntyre 52d0a9f08b Round off the DVD size in blocks 2006-12-10 22:23:51 +00:00
Steve McIntyre cf079be95b Re-add the build date to .disk/info, lost in the merge 2006-12-10 21:27:06 +00:00
Steve McIntyre 5b26423869 Minor tweaks for businesscard CDs 2006-12-10 20:12:46 +00:00
Steve McIntyre 7780369fd4 * When we've finished making a CD tree in make_disc_trees.pl,
re-compress the gzipped Sources and Packages. Workaround for bug
    #402482 in busybox gunzip code.
2006-12-10 20:00:37 +00:00
Steve McIntyre 50058df56f * Improve performance: rewritten tools/make_disc_trees in perl so we
can call add_packages directly as a perl function rather than via
    fork/exec all the time. Re-arranged tools/add_packages to make
    this work.
  * Improved logging in add_packages.
2006-12-10 18:57:29 +00:00
Steve McIntyre eb73154582 Reimplement make_disc_trees in perl for better performance. More to come... 2006-12-10 15:26:19 +00:00
Steve McIntyre f6e24e76fa Cosmetic changes to listcds 2006-12-10 15:13:12 +00:00
Steve McIntyre 60eef836ce * Lower-case package names at various points to work around apt bug
#402354. Fixes the long-standing warnings from list2cds about "Use
    of uninitialized value in string comparison", and allows some poor
    packages to make it onto CDs for the first time...
2006-12-10 02:18:28 +00:00
Steve McIntyre b9280f8c80 * Add Packages and Sources files to the Release file; clean up the
checksums. Closes: #402267
2006-12-09 22:31:23 +00:00
Steve McIntyre 44b17db956 Don't check source-only discs for installability of base 2006-12-08 16:00:36 +00:00
Steve McIntyre d3aa586a36 Fix simple cut-n-paste error 2006-12-08 13:55:52 +00:00
Steve McIntyre 7c746a97e9 Slightly cleaner handling of mkisofs_opts and _dirs 2006-12-08 12:17:24 +00:00
Steve McIntyre e9be1e7c20 Make the FAQ extraction not be verbose 2006-12-08 11:56:52 +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 73f3f85b6b Match *CD rather than CD for the 650MB image size, so the KDE builds work 2006-12-08 00:48:08 +00:00
Steve McIntyre 634682f779 Fixing oversights from the big merge 2006-12-07 23:51:14 +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
Frans Pop 5f62118c2c Daily builds for amd64 now done by Andreas Barth; with thanks to Kurt Roeckx 2006-12-07 01:01:01 +00:00
Steve McIntyre 4c83b14ad9 Fix md5sum file format 2006-12-05 17:52:07 +00:00
Steve McIntyre a689886868 Fix typo bug, improve error handling 2006-12-04 17:23:57 +00:00
Colin Watson 7a843520eb * Include prep support on powerpc images again. 2006-12-04 10:30:40 +00:00
Frans Pop 82d1b005fc * tools/generate_di+k_list: no longer include kernel-image packages for
powerpc as we don't support 2.4 based installs anymore. Closes #401429.
2006-12-03 19:11:45 +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 a46520a7fd Remove sh from the arch list in generate_di_list, to make builds quieter 2006-11-30 21:50:29 +00:00
Steve McIntyre ff845c2120 * Dump the mkisofs command-line used for each CD into .disk/mkisofs
as we make it. Closes: #258099
2006-11-28 00:19:55 +00:00
Steve McIntyre 4ded5ac8d9 * Add bpalogin near the top of the task list, as requested a long time
ago. Closes: #231583
2006-11-27 23:46:07 +00:00
Steve McIntyre 27f9fc5ef5 s/raw/iso/ 2006-11-27 17:03:22 +00:00
Steve McIntyre 3f2f6c11e3 Don't attempt to make ppc CDs bootable after #1 2006-11-27 09:43:10 +00:00
Steve McIntyre 9b44f8f3e0 Fix f1.txt mods - only apply on CD1 2006-11-27 09:36:49 +00:00
Steve McIntyre 4c31948c4b Quick fix 2006-11-27 04:16:52 +00:00
Steve McIntyre 1586e5757b Try again on .disk/cd_type 2006-11-27 03:22:34 +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 38aa21763a * DEVEL BRANCH MERGE: Change mkisofs_opts usage: add a shell function
for the boot-$arch scripts to use rather than simply appending to the
    $N.mkisofs_opts file directly. Needed for forthcoming multi-arch
    support.
2006-11-27 02:15:29 +00:00
Steve McIntyre 89235c1124 Try again for dates 2006-11-26 22:53:28 +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 40c9c0b3d0 Typo fix 2006-11-25 03:20:51 +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 9924a80b78 * Include floppy disk images again for i386. 2006-11-23 00:42:39 +00:00
Steve McIntyre 3e59b569ea Current values 2006-11-17 00:35:50 +00:00
Frans Pop 2a9dbeb4d8 * Include "tape" images again for S/390. 2006-11-02 07:21:58 +00:00
Steve McIntyre b5de101510 Current boot- sizes 2006-10-31 00:06:55 +00:00
Frans Pop 8e15dce126 tools/generate_di+k_list: add new required packages for arm 2006-10-28 19:51:11 +00:00
Frans Pop 6813379884 - tasks/exclude-etch: clean out obsolete entries
- tools/generate_di+k_list: generic suffix was dropped for amd64 kernels
2006-10-28 16:45:07 +00:00