Commit Graph

897 Commits

Author SHA1 Message Date
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 7b9e96355e Excluding reiserfs4 udebs is not needed for Squeeze
They are no longer being built.
2010-03-12 02:18:05 +00:00
Frans Pop 7f2d5a048c Exclude udebs for X.Org-based version of the Graphical Installer
If needed they will all be included in the D-I images.
2010-03-12 02:18:01 +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 29a5a2b6ce Ready for a new release 2010-02-21 22:49:58 +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 38423b9daa Export the CDNAME variable in the conf file. Patch from Karl Goetz. 2010-02-21 21:40:25 +00:00
Steve McIntyre ebc4911a59 Improve the description for MAXCDS in the conf file. 2010-02-21 21:29:17 +00:00
Steve McIntyre 37f2de9fbf Improve the description for MAXCDS in the conf file. Patch from Karl Goetz. 2010-02-21 21:27:50 +00:00
Joey Hess ea87b8decd * Add firmware-linux-nonfree to firmware list. Left firmware-linux for now
though it is now only a dependency package.
* Add firmware-linux-free to firmware list, as a convenient way to make
  it available along with the other firmware files. (It could, instead,
  be included directly in d-i images, if there were a udeb.)
  Closes: 566561
2010-01-23 23:27:16 +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
Steve McIntyre fbc97b97c6 * Fix link in README.html.in for lenny, and update squeeze to match.
Closes: #542191
2009-10-05 14:46:19 +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 52ff98b0de Create apt/preferences.d in APTTMP, keeps newer apt from printing a warning. 2009-08-23 11:08:30 +00:00
Frans Pop 75de60e657 Add changelog entry 2009-08-23 07:10:14 +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 45ae0b76bc Add path when sourcing CONF.sh for compatibility with dash
Spotted by Ian Campbell.
2009-08-07 14:06:09 +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
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 9268b3b595 Revert "Explicitly support sun4v (Niagara systems) in silo.conf"
Silo does not seem to understand sun4v.
2009-06-13 15:45:57 +00:00
Frans Pop 7403cf515d Explicitly support sun4v (Niagara systems) in silo.conf 2009-06-13 14:52:50 +00:00
Frans Pop c6e842e393 Display message for unsupported sparc subarchitectures 2009-06-13 14:52:42 +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 31a18757f2 ready to release v3.1.2 2009-05-16 21:13:17 +00:00
Steve McIntyre 0c74b3f085 Modify README.html: only attempt to link to the release notes and
installation manual on release-ready builds, otherwise suggest the
alioth version of the installation manual. Closes: #330398
2009-05-16 20:50:03 +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 afd7a7a557 Recognise and ignore Breaks: lines. Closes: #523444 2009-05-16 13:48:49 +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
Joey Hess dfd2e454dc Re-add zd1211-firmware to firmware task.
This comment was not very cler:
/* zd1211-firmware disabled due to #492205 */
The real bug, #492272, was fixed in version 2.21.0.0-0.1:
2009-04-29 21:12:25 +00:00
Joey Hess e6fdddb49b Add firmware-linux to firmware task. 2009-04-29 21:07:31 +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
Steve McIntyre 4ae970d0de push wpasupplicant onto CD#1; #517298 2009-04-01 23:24:46 +00:00
Steve McIntyre 3cd898d6b4 * Don't call images beta if they're using OFFICIAL_VAL == 2.
Closes: #516353
2009-04-01 21:40:40 +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
Steve McIntyre 2cc2f1fe15 Fix the changelog to match the released version 2009-02-12 10:50:10 +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 2e4fa00e42 Remove a non-ascii character that somehow slipped in 2009-02-04 22:52:01 +00:00
Otavio Salvador 5a141becf7 do not exclude libaio1-udeb from CDs. 2009-01-30 21:35:04 +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 1477ac67b6 sparc: remove bogus default "append=cdrom" line from silo.conf template
AFAICT this option does not do anything: we're already booting from
CD-ROM at this point. If it were needed, it should also have been
included in the other append= lines.
2009-01-20 00:39:05 +00:00
Frans Pop c1f163f7c8 Release version 3.1.0 (add myself as uploader) 2009-01-12 15:50:30 +00:00
Frans Pop a145132fea Recode debian/copyright file to UTF-8 2009-01-12 15:50:27 +00:00
Frans Pop e5d246e8b0 README.easy-build: document how to use custom packages and D-I images 2009-01-12 15:11:02 +00:00
Frans Pop 08e7c4e5f7 Further reduce exclude list for Lenny
xmail and cdebconf were excluded because they got pulled in through
alternative dependencies, which is no longer an issue.
2008-12-28 20:15:57 +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
Frans Pop 66e518754a Update exclude list for Lenny
- Remove aspell* packages as they do not included on CD1 anyway and
  excluding them also means they get excluded from DVD1.
- Remove xen/vserver linux-image packages as they do not get included on
  CD1 anyway.
2008-12-13 17:40:04 +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 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 d01a79979a Update list of languages supported by tasksel and D-I for Lenny 2008-12-05 14:12:13 +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 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 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 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
Steve McIntyre 1db50822b3 Add contrib/ to the package 2008-11-23 18:04:12 +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 88824982ba Fix error in expansion of %ARCH% variables in D-I image location envvars 2008-11-14 20:14:35 +00:00
Frans Pop 46ff6763b2 Clean up and update interesting-fromcd23 and exclude task files for lenny 2008-11-14 14:41:31 +00:00
Frans Pop 588c20b212 Updated contrib/testingcds
Replace the example testingcds script in contrib with its current version
on farbror. Update the script for the dynamic task files change.
2008-11-13 23:19:38 +00:00
Frans Pop a0a21c149c At least mention EXCLUDE in CONF.sh 2008-11-13 23:19: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 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 6853ba25d6 Update update_popcon to cope better with errors; now uses curl instead of wget 2008-11-02 09:20:39 +00:00
Steve McIntyre e56a7c5fb0 Fix how directory trees are created in update-cd. Closes: #503911 2008-11-02 02:55:34 +00:00
Frans Pop 7b759c8cd8 Improve changelog entry 2008-11-01 23:54:58 +00:00
Steve McIntyre 1ea65fea7d Rename list2cds to sort_deps - more accurate name now that other code does the per-disc splitting later 2008-11-01 23:09:33 +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
Steve McIntyre aae8e698dc Ready for a new upload 2008-10-26 23:23:50 +00:00
Frans Pop 774bd01ca9 Update and cleanup udeb exclusion lists for lenny (general, i386, amd64)
Some udebs that no longer exist are removed and new (in some cases not
really new, but well) udebs that are known to be included in the initrd
are added. For i386 and amd64 the list of kernel udebs already included
in the initrd is updated.
2008-10-14 20:56:35 +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 f9dbedaeed Exclude 686-bigmem kernel udebs
They are only used for Xen netboot installs.
2008-10-14 09:59:22 +00:00
Frans Pop ef7069ec7a CONF.sh updates
- change default CODENAME to lenny
- change example paths to mirror to /srv/mirror instead of /mirror
2008-10-14 08:40:58 +00:00
Frans Pop 425c2aa12c Document easy-build script 2008-10-14 08:22:10 +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