Commit Graph

1169 Commits

Author SHA1 Message Date
Steve McIntyre 9f52089e74 tools/generate_firmware_task: Add LOCALDEBS support 2012-03-05 13:41:01 +00:00
Steve McIntyre f0fab2ac91 generate_d-i+k_list: Add ufutils. Closes: #662234 2012-03-04 22:21:33 +00:00
Steve McIntyre 4241d811cb Add graphical installer image for kfreebsd-amd64. Closes: #651530 2012-03-03 22:50:10 +00:00
cd-builder user fb2524035f cope with the FreeBSD v9 images not being in the current squeeze release 2011-12-14 15:40:46 +00:00
Steve McIntyre 353bad5355 Add kfreebsd 9. Closes: #650926 2011-12-08 15:34:14 +00:00
Steve McIntyre 38da832619 Add an extra tweaked version of d390.ins for s390 booting. The
Hardware Management Console needs the file to be in the root
directory.
2011-11-30 17:49:48 +00:00
Steve McIntyre 0bb4c00e03 Add more debug when we fail to find Packages data for some reason 2011-11-28 16:20:50 +00:00
Steve McIntyre 24373c514f Don't process translated descriptions for source-only discs 2011-11-28 16:19:38 +00:00
Steve McIntyre 0b3dacd1c7 Clean up bogus warnings 2011-11-28 14:35:26 +00:00
Steve McIntyre 047c3d8455 Change the code for translated description files to use gzip instead
of bzip2; apt can't cope with bzipped files on CD!?!
2011-11-21 00:12:39 +00:00
Steve McIntyre 35ce658443 * Remove lots of old stuff neither needed nor supported any more:
+ removed architectures: alpha arm hppa
  + removed releases: etch lenny
  + removed unversioned data/sparc and data/yaboot, versioned
    equivalents are in place already.
2011-11-14 15:25:07 +00:00
Steve McIntyre 731cb5ec3e Update list of Linux kernel packages. Closes: #648690. Thanks to BEn
Hutchings for the patch.
2011-11-14 15:10:15 +00:00
Steve McIntyre d6ad2ed8e7 Add support for translated package description files. Closes: #495102
+ Add needed dependency on bzip2
+ Other minor cleanups in tools/make_disc_trees.pl
2011-11-14 00:14:30 +00:00
Raphaël Hertzog e79ecc1416 * Changes triggered by various lintian warnings:
+ Switch to “3.0 (native)” source format to get rid of .svn
    directories in the source package (when built from the svn checkout
    directly)
  + Support build-arch/build-indep targets in debian/rules.
  + Drop executable rights from tools/boot/wheezy/boot-hurd
    (and fix debian/rules to not re-add it).
  + Bump Standards-Version to 3.9.2 (no change required).
2011-11-06 13:34:06 +00:00
Steve McIntyre aee8d4a710 Fall back to old Xen config if needed 2011-08-18 20:18:15 +00:00
Steve McIntyre 4aed803ee3 Rename "xm-debian.cfg" to just "debian.cfg" for Xen config. 2011-08-16 10:58:43 +00:00
Joey Hess 9206b4d7c2 Read tasksel's debian-tasks.desc from its new location.
Falls back to old location so update_tasks can still be used with old
tasksel.

This does not deal with most of the task information being removed from
debian-tasks.desc. The file still has Key fields, that now list the task-*
packages, and the packages Depend on the crucial packages for the task.
So to that extent it should continue to work.

However, with NORECOMMENDS set, the Recommended other packages for tasks
won't be included on CD. This still needs to be dealt with, probably by
adding all packages listed in Recommends of task-* packages to the
generated task list files.
2011-08-06 16:17:24 +00:00
Steve McIntyre a83d3869d4 Add zfsutils into the generate_d-i+k_list for kfreebsd users. 2011-08-05 12:44:20 +00:00
Steve McIntyre f05a9bafcf Fix calls to which_deb, not on the path 2011-07-18 12:11:02 +00:00
Steve McIntyre ba07703aaa * Switch i386 kernel flavours again on advice from Ben:
+ Removed all mention of 686-bigmem as it's now gone
  + Moved 686 to interesting-fromcd23
  + Added 686-pae onto CD#1 in place of 686
  + Leave the 486 kernel on CD#1 still, for people who can't use 686-pae
2011-07-08 10:59:48 +00:00
Steve McIntyre 21ce30d63d Add configuration for the snapshot.d.o URL 2011-07-01 12:36:59 +00:00
Steve McIntyre 264d8436bd Add links to snapshot.debian.org into jigdo files 2011-07-01 12:26:05 +00:00
Steve McIntyre 37e69e2d27 Remove dead commented code 2011-06-10 16:29:40 +00:00
Steve McIntyre d872cea0c1 Remove the checked-in firmware task altogether, as it's not
useful. Generate it when needed using the new script
tools/generate_firmware_task.
2011-06-10 16:21:32 +00:00
Steve McIntyre 3ea05ce326 use grep-dctrl more efficiently 2011-06-10 16:18:30 +00:00
Steve McIntyre 1083496a49 Rewrite of core logic.
Rather than use the firmware task which gets out of date, look for
firmware/microcode files directly in the Packages file. Check for
things installing in /lib/firmware, and add those packages.
2011-06-10 13:26:30 +00:00
Steve McIntyre b33996bd64 new location for firmware task file 2011-06-10 12:52:38 +00:00
Steve McIntyre 99e6133fda tools/grab_md5: Make arch handling more generic - instead of having to
list all arches, allow a wildcard and then check for lack of
Packages.gz files
2011-06-09 15:27:00 +00:00
Steve McIntyre 17686a2761 minor indent change 2011-06-09 15:25:38 +00:00
Steve McIntyre 8b66b324b7 Improve Packages and Sources file parsing; cope with
differently-formed files that are still valid (don't assume field
ordering)
2011-05-11 10:54:06 +00:00
Steve McIntyre acc068350b update the URL for downloading armel d-i dailies 2011-05-10 22:26:58 +00:00
Steve McIntyre 5e429358cd update the URL for downloading i386 d-i dailies 2011-05-10 07:14:27 +00:00
Steve McIntyre ee04b44598 update the URL for downloading s390 d-i dailies 2011-04-25 18:34:57 +00:00
cd-builder user 8a8d4545a2 log genisoimage / xorriso versions used for build 2011-03-30 15:33:39 +00:00
Steve McIntyre 9087898b11 Add support for hurd-i386. Closes: #619211 2011-03-30 10:29:44 +00:00
Steve McIntyre 30ba984b96 daft cut and paste error 2011-03-28 16:29:16 +00:00
Steve McIntyre f3bcdaabe8 When adding packages outside of the normal path, add them to the list
of packages on the CD too. There's always a small chance we'll have to
remove them *again* (e.g. large source packages that don't fit), so
let's make that possible.
2011-03-28 12:36:58 +00:00
Steve McIntyre 3c3d7049ca generate list files directly while we still have the CD tree available 2011-03-24 02:08:58 +00:00
Steve McIntyre 32b3a4d4cb * Update make_disc_trees.pl and which_deb to cope with different
types of source file, and clean up the code in that area.
2011-03-23 17:23:50 +00:00
Steve McIntyre 40c15e468d * Merge update-cd changes back from the squeeze branch:
+ Remove the old non-US stuff from it, it's not been needed in years.
  + Cope with .bz2 source files too.
  + Merged and simplified the old functionality from scansources.old
    and scanpackages.old into the new script create_control.
2011-03-23 17:19:49 +00:00
cd-builder user d329d30d7d re-add old script needed for update_cd 2011-03-22 11:12:37 +00:00
Steve McIntyre 68cacf2af0 tone down messages about missing {BASE,UDEB}_{INCLUDE,EXCLUDE} files
from ERROR to WARNING. Closes: #615043
2011-03-04 13:31:09 +00:00
Steve McIntyre 0369744ff3 try #2 2011-03-04 13:20:56 +00:00
Steve McIntyre 70fe61ff45 try #2 2011-03-04 13:19:34 +00:00
Steve McIntyre 569e188f04 * Add more checksum types to generated Release files; go from md5 only
to md5, sha1, sha256 and sha512.

Initial checkin, untested code yet!
2011-03-04 13:11:16 +00:00
cd-builder user 192ab9e1e6 armel hasn't booted off CD in ages for us; comment out the DI_WWW_HOME
definition to stop the mirror script complaining.
2011-03-03 14:33:07 +00:00
Steve McIntyre 1250b9bca0 use the full correct path 2011-03-02 22:45:11 +00:00
Steve McIntyre 3df17fb170 Path to sparc daily builds has changed. 2011-03-02 22:33:47 +00:00
Steve McIntyre e12ab9e518 Special-case builds of source-only discs: if we think we've overflowed
the disc size, try to carry on for a few more packages to get closer
to actually filling the disc. Closes: #613751.
2011-02-23 17:30:27 +00:00
Steve McIntyre 317536973a More tweaks to logging for sizes 2011-02-23 15:24:06 +00:00
Steve McIntyre 877fa688cc daft syntax error 2011-02-23 14:15:35 +00:00
Steve McIntyre cab1964fe1 More tweaks to logging for sizes 2011-02-23 14:11:42 +00:00
Steve McIntyre fb03fc2424 More tweaks to logging for sizes 2011-02-23 14:01:33 +00:00
Steve McIntyre addab9dec9 More tweaks to logging for sizes 2011-02-23 13:57:40 +00:00
Steve McIntyre 2148f6d1d4 make logging clearer for mixed-size builds 2011-02-23 13:51:17 +00:00
Steve McIntyre 3c3aa8d79b * Add disk size definitions for 1/2/4/8 GB USB sticks.
* Extend the size-override code to allow to override an individual disc
  in the set (e.g. to make the first DVD fit on a 4GB USB stick).
2011-02-23 13:41:33 +00:00
Steve McIntyre 7fe446b244 Add support for over-riding disc size on demand, used for some of the squeeze release builds 2011-02-22 21:52:28 +00:00
Steve McIntyre 5019f35713 Remove win32-loader standalone flavours from the tools/ directory on
x86. Closes: #612224
2011-02-22 20:52:44 +00:00
Otavio Salvador 39b4a7300d Add btrfs-tools on required packages by installer. Closes: #612007. 2011-02-17 16:25:21 +00:00
Steve McIntyre 6e44e0ff27 start wheezy development; svn cp squeeze wheezy and s/squeeze/wheezy/ 2011-02-07 22:30:21 +00:00
Steve McIntyre f6cf83e29a Fix indentation 2011-02-02 23:23:07 +00:00
Steve McIntyre ce8d2493db Add a bluray option in .disk/cd_type so that d-i can work with it 2011-01-08 23:39:31 +00:00
Steve McIntyre 8c9457ed30 remove the Bin- and Src- components from the volid; xorriso is picky 2011-01-08 23:35:59 +00:00
Steve McIntyre d71a59e14e * Drop the recommended size for BD-ROMs slightly, on the
recommendation of Thomas Schmitt. This will make it more likely that
  we'll fit on all media.
2011-01-07 13:22:11 +00:00
Steve McIntyre f6042461c3 add the jigdo opts when trying to estimate sizes - this matters for xorriso if we want to be accurate 2010-12-28 20:07:29 +00:00
cd-builder user 07e283ef7f Make sure output iso images are readable, even if xorriso doesn't 2010-12-27 19:50:03 +00:00
cd-builder user 58f17a7504 Remove directory name hack for xorriso, not needed for newer version 2010-12-26 19:24:30 +00:00
Steve McIntyre fc722916d0 * Add code to make isohybrid images for i386/amd64:
+ Makefile: Add support for overriding the MKISOFS and MKISOFS_OPTS
      variables on a per-arch basis
    + CONF.sh: add working examples for this
    + tools/boot/squeeze/boot-x86: if configured to use xorriso, add the
      extra command line options to add the isohybrid MBR. Also work
      around a difference in ISO directory naming between genisoimage and
      xorriso.
2010-12-24 23:28:44 +00:00
Steve McIntyre f370f47f8b use squeeze, not lenny 2010-12-18 16:41:12 +00:00
Steve McIntyre 0da18ecb7f copy the lenny code for adding the installation guide etc 2010-12-18 16:39:29 +00:00
Steve McIntyre 4cea3e7385 Switch to --iso-level 4 for powerpc images to make them work better
with POWER machines. Thanks to Milan Kupcevic for the patch. Closes: #603536
2010-12-18 16:22:12 +00:00
Steve McIntyre 14a97fb63b make imagesums more verbose 2010-12-09 16:01:47 +00:00
Steve McIntyre cfe4357de6 For testing purposes - set up FORCE_SID_TASKSEL to force us to use
sid's tasksel data even if we're using stable/testing.
2010-12-09 15:58:22 +00:00
Steve McIntyre e7e5fec52f Pass the base mkisofs options into make_disc_trees too. 2010-11-27 18:28:45 +00:00
Steve McIntyre 54463f11cb Fix lintian warning: doesn't need shebang 2010-11-14 16:23:32 +00:00
Holger Levsen 400f356afa Start work on Debian Edu images. 2010-10-31 15:12:54 +00:00
Steve McIntyre 938be9c307 Support replacing the g-i image with ones own image. Closes: #601189 2010-10-26 18:33:22 +00:00
cd-builder user e531a557c2 Add tentative support for omitting 486-class kernel bits in a build 2010-10-18 14:26:39 +00:00
cd-builder user 2881090376 Tweak the volume ID generation code to cope with longer arch names (e.g. freebsd arches) 2010-10-18 14:24:22 +00:00
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