Commit Graph

911 Commits

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