Commit Graph

1006 Commits

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