Commit Graph

1186 Commits

Author SHA1 Message Date
Steve McIntyre e0ac5cf3cf Tweak layout of code 2013-03-07 07:33:58 +00:00
Steve McIntyre 075a74d33a Add missing 'cache' command 2013-03-07 07:29:59 +00:00
Steve McIntyre 38ec979060 * Add extra text to boot messages on powerpc to tell people about how to
select a different desktop. Thanks to Rick Thomas for the
    text. Tweaked slightly to list the default on the current disc too.
2013-03-07 07:21:09 +00:00
Steve McIntyre 82f8590462 Work out the default desktop for generic/all discs 2013-03-07 06:47:49 +00:00
Steve McIntyre 7ef1b0a5c8 * Update boot-mipsel and boot-hppa to use the which_deb script for
better safety when extracting boot loader files.
  * Update all the relevant boot-* scripts to do the right thing when
    extracting packages and sources, depending on
    $ARCHIVE_EXTRACTED_SOURCES as above
2013-03-07 06:34:07 +00:00
Raphaël Hertzog 4d8f781235 Update logic protecting lookup of syslinux's source in tools/boot/wheezy/boot-x86
Steve pointed out that this lookup is only here so that helper scripts
can grab those sources and make them available in a public location
such as http://cdimage.debian.org/cdimage/cd-sources/. The sources are
not embedded in the generated ISO and are thus not strictly needed
for building the ISO image.

This should happen even when we're not building source ISOs but it's
not needed if we don't have any similar policy in place. Thus CONF.sh
is now leaving $ARCHIVE_EXTRACTED_SOURCES unset by default and the
source will only be looked up if that value is set.
2013-03-01 13:22:22 +00:00
Raphaël Hertzog d79ac8335d Update tools/boot/wheezy/boot-x86 to not look for syslinux's source
package if we're not including sources.
2013-03-01 08:50:34 +00:00
Steve McIntyre bd8597feaa Deal with syslinux version 5.x needing to install more files for
bootable x86 media. Thanks to Daniel Baumann for the path.
Closes: #699884
2013-02-12 13:43:29 +00:00
Steve McIntyre 183ce1c83f Fix minor logic hole in source matching 2013-02-01 03:49:49 +00:00
Steve McIntyre 9d50fdb6f1 Fix up logic again for udebs without findable source 2013-01-30 19:40:01 +00:00
Steve McIntyre 4b512541d8 Make sure the DEBIAN_KERNEL placeholder in README.* is replaced;
switch from cpp to sed for that so it works inside quoted
text. Closes: #699198
2013-01-29 18:22:44 +00:00
Steve McIntyre 252013342e * Add support for Built-Using:
+ tools/sort_deps: parse out Built-Using from Packages files too and
      pass any such data on to tools/merge_package_lists
    + tools/merge_package_lists: if we have any built-using source
      packages listed when doing a combined binary/source set, add them in
      the same way as existing listed sources.
  * Other bug fixes in tools/merge_package_lists:
    + Fix handling of multi-line Binary: fields
    + Print out the accumulated size of source packages in output also
      (fix to printf format string)
2013-01-24 10:26:30 +00:00
Steve McIntyre e9ad5c11a4 Re-indent for sanity 2013-01-23 02:21:07 +00:00
Steve McIntyre f7269f8b4f Fix up xdigit regex to cope with new match code 2013-01-22 23:45:23 +00:00
Steve McIntyre 513f8c1191 When building source-only discs, cope with having multiple different
versions of a source package:

+ make_disc_trees.pl now tracks arrays of packages when parsing
  apt-cache output
+ We'll now pull in all the extra packages included in Sources.gz
  because of Built-Using.
2013-01-22 23:32:54 +00:00
Steve McIntyre 5d2db49de9 Depending on the version of xorriso we have, use different EFI command line options 2013-01-15 01:51:51 +00:00
Steve McIntyre f299e200d7 only add a partition offset if we don't have grub files 2013-01-15 01:32:39 +00:00
Steve McIntyre 5cb7afe1f2 add code to grab the version of xorriso 2013-01-15 01:14:22 +00:00
Steve McIntyre 75053f33dc shuffle code a little 2013-01-15 01:09:52 +00:00
Steve McIntyre fdc90e1e3a Switch boot-x86 to always depend on xorriso now 2013-01-15 01:05:18 +00:00
Steve McIntyre d51ba39a32 Also print out any trailing kernel entries 2012-12-29 03:52:48 +00:00
Steve McIntyre 17f65ab8e2 Provide a better set of boot menus when booting via EFI. Previously
had a limited set of hard-coded menu entries - this was buggy and
didn't take into account all the possible boot variations. Now parse
the isolinux menus already provided in the d-i build and generate
equivalent grub menus, complete with themes for a reasonable layout
with graphics and titles.
2012-12-10 01:12:44 +00:00
cd-builder user 23b814b5bc silly thinko 2012-12-06 17:39:34 +00:00
Steve McIntyre 3e98cc6044 * Improve architecture support in which_deb. Closes: #695244
+ Check all the architectures available in the archive if we're not
    specifically told which to use (e.g. on source builds)
  + If we fail to find packages/sources for the specified package, say
    so and bail out properly.
2012-12-06 17:36:28 +00:00
Steve McIntyre ca4ae110df Bugfix for new sort_deps code:
Old code used to add the various options in the special case for
"pacakges providing not truly virtual pacakges", which amounted to an
OR dep on the whole set. I missed that in the re-implementation with
version tracking.

Now explicitly switched to adding an OR dep for *all* cases here -
other code will deal with that already. Tweak the logging code to make
things clearer too...
2012-09-27 18:26:19 +00:00
Steve McIntyre b435f7b341 Make the dump of dependencies more verbose at parse time 2012-09-27 16:52:00 +00:00
Steve McIntyre 6230392432 Fix scoping bug when parsing dependencies
The %elt hash needs to be a new one each time we push to the
dependency lists, otherwise we'll just be updating the existing one
each time we push().
2012-09-27 16:49:26 +00:00
Steve McIntyre c46f7c0cf6 * Add version-tracking into dependency sorting. Closes: #687949)
+ Use/parse output from a newer version of apt so that "apt-cache
      depends" will include version information on dependencies.
    + All tracking of packages now include versions, so we pass around
      hashes of {package name, comparison op, version} everywhere instead
      of simply passing package names as strings.
    + Add the APT::Cache::ShowVersion=1 option to apt-cache calls to
      turn on version reporting. Needs a locally-patched version of apt
      *for now*, but expecting that to be fixed for the Wheezy
      release. The new code degrades gracefully if version info is not
      available.
    + Add a dependency on libdpkg-perl for version comparison code.
2012-09-26 18:18:47 +00:00
Steve McIntyre 7072e8b02c Add /sbin and /usr/sbin to PATH, needed for mkfs.msdos and maybe other tools 2012-09-26 09:45:05 +00:00
Steve McIntyre 579e443ca5 * Merge x86 EFI support from the EFI_support branch (Closes: #658352)
+ Pull in grub-efi for amd64 and i386
    + Lots of extra code in boot-x86:
      - pull grub EFI pieces out of the latest debian-cd_info.tar.gz
    	blobs in d-i, if they're there. If so, use them to make x86 images
	    bootable via EFI (both via CD and USB)
      - generate boot entries for grub on the fly; temporary code for now,
	    will switch to parsing the isolinux entries shortly instead.
      - depending more and more on xorriso rather than genisoimage...
2012-09-26 00:17:27 +00:00
Steve McIntyre f92b41bb54 BLS=4 for BIOS boot 2012-09-20 11:46:46 +00:00
Steve McIntyre 4ba7173970 Remove redundant mouseemu entry 2012-09-04 16:56:11 +00:00
Steve McIntyre c7a51f405f Move the mkisofs_opts calls until after we've copied the isolinux.bin file into place 2012-08-13 13:22:13 +00:00
Steve McIntyre a37770b429 Update the boot-load-size parameter for all ElTorito booting arches 2012-08-13 13:06:04 +00:00
Steve McIntyre 4d8a88e5da * Tweak boot-load-size for ia64 to make CDs boot again. Closes: #678883.
Thanks to Stephan Schreiber for the patch.
2012-08-07 20:48:16 +00:00
Steve McIntyre 747c65e354 * Tweak powerpc boot options, using 32/64 bit detection in yaboot at
boot time. Thanks to Milan Kupcevic for the patch. Closes: #678066
2012-08-04 17:47:47 +00:00
Steve McIntyre c245a5c696 Tweak sort_deps:
+ Track whether a dependency chain is caused by a hard dependency
  (Depends) or soft (Recommends/Suggests). If we fail to add a package
  down the chain on a *soft* dependency, don't invalidate the entire
  chain.
+ When checking OR dependencies, *first* check to see if any of the
  options are already installed *before* trying to install the first
  option. Helps a lot with circular deps such as task-lxde-desktop ->
  task-desktop -> (task-gnome-desktop | task-lxde-desktop | etc.); in
  this case, of course task-lxde-desktop should satisfy the OR dep.
2012-08-02 23:57:40 +00:00
Cyril Brulebois 965b86c295 Make grab_md5 more robust.
If $DI_CODENAME is ever set to a bad value, one would end up trying to
use a non-existing debian-installer, resulting in non-bootable images
way later. To detect that much earlier, make sure all locations
(computed from $CODENAME and $DI_CODENAME) are directories.
2012-07-13 21:34:54 +00:00
Steve McIntyre ac9aca28db YA typo fix 2012-07-08 18:40:21 +00:00
Steve McIntyre 281dd7f076 add debug for unstable tasks pkgs 2012-07-08 18:37:42 +00:00
Steve McIntyre 0feb53ab54 fix typo 2012-07-08 18:20:44 +00:00
Steve McIntyre 024f95622f Add support for using unstable tasks packages when debugging 2012-07-08 18:16:05 +00:00
Steve McIntyre 69284b5972 fix missing brace :-( 2012-07-08 17:44:34 +00:00
Steve McIntyre 567ad9ed25 tweak first parsing loop 2012-07-08 17:14:53 +00:00
Joey Hess a241ec8aa5 fix file encoding 2012-07-08 16:06:54 +00:00
Steve McIntyre eb3b7bd868 Move bpalogin from netinst to full CD 2012-07-08 00:33:43 +00:00
Steve McIntyre 7d101800c6 Sort the generic required packages into groups 2012-07-08 00:29:46 +00:00
Joey Hess d4a05b2467 move dm-setup to all arches 2012-07-08 00:12:38 +00:00
Steve McIntyre 5bf04cbd14 Explicitly add s390-tools and sysconfig-hardware for s390. 2012-07-07 23:12:24 +00:00
Joey Hess 7a03cebf44 * Clean up forcd1, removing twm, wmaker, wmakerconf, pump,
menu (pulled in by desktop tasks),
  aptitude (pulled in by debootstap, and may be demoted to optional),
  alsa-utils, alsa-base (pulled in by task-desktop),
  mdetect, read-edid (no longer used by xorg),
  grub (handed by generate_di+k_list),
  deborphan, debfoster, localepurge (expert user stuff),
  chdrvfont (no such package any more)
* Updated generate_di+k_list to match more closely the current
  packages d-i apt-installs.
2012-07-07 22:36:24 +00:00
Steve McIntyre c92c20ad36 Add gtk initrd to hurd-i386 images. Closes: #635260
Thanks to Samuel Thibault for the patch.
2012-07-05 23:48:48 +00:00
Steve McIntyre 562f02742e Add explicit support for the light CD tasks into the new update_tasks 2012-06-05 17:28:41 +00:00
Steve McIntyre 9ccd9c397f Switch over to working with new task-* metapackages. Closes: #672941 2012-06-05 17:04:04 +00:00
Steve McIntyre faf4b2a97c Fix require ordering for read_env 2012-06-05 14:20:06 +00:00
Steve McIntyre 6686e2c66c Clean up handling of environment variable handling in perl tools. 2012-06-05 13:56:51 +00:00
Steve McIntyre 8ac07a76fd Describe discs appropriately depending on the kernel used.
Closes: #673975
2012-05-30 07:35:23 +00:00
Steve McIntyre 32a101d56c Add s390x as a known architecture, merging common s390/s390x boot
setup scripts.
2012-05-28 22:42:43 +00:00
Steve McIntyre ff3da67911 Tweak command line options for creating source images: add -joliet-long 2012-05-04 12:16:46 +00:00
Steve McIntyre 7f852be440 tweak exec bits 2012-03-16 15:00:50 +00:00
Steve McIntyre 730ee51310 Add armhf architecture 2012-03-16 14:43:18 +00:00
Steve McIntyre 31a7b9ed9b Add more armel kernel flavours 2012-03-16 14:32:39 +00:00
Steve McIntyre 93125afb4e fix up testing images where not all the file variants exist yet 2012-03-15 15:46:19 +00:00
Steve McIntyre f0ba77f6e9 Some of the images aren't in wheezy yet 2012-03-05 22:50:23 +00:00
Steve McIntyre 9131b33b53 fix silly syntax error 2012-03-05 22:42:30 +00:00
Steve McIntyre cdfeaa7eea fix perl errors when is not in the environment 2012-03-05 22:40:51 +00:00
Steve McIntyre 55f8fdac36 tools/generate_firmware_task: silly fixes 2012-03-05 16:13:17 +00:00
Steve McIntyre 4a852eaac6 tools/generate_firmware_task: Add LOCALDEBS support 2012-03-05 13:42:19 +00:00
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