Commit Graph

854 Commits

Author SHA1 Message Date
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