Commit Graph

1105 Commits

Author SHA1 Message Date
Steve McIntyre 835cbca01b Pull out some more common code into common.sh to simplify the various
boot-$arch scripts
2013-12-16 14:05:35 +00:00
Steve McIntyre 3e0309bc85 Trivial code consistency cleanups 2013-12-16 13:40:05 +00:00
Steve McIntyre 08c66eaf07 * tools/update_tasks: don't hard-code the default desktop to use,
instead work it out directly from the dependencies of the task-desktop
  package.
2013-11-05 01:29:40 +00:00
Steve McIntyre bc4d87e06f Remove s390 from the arch lists
Remove s390 from the arch lists in various scripts, as it's going
away. Support remains if specifically configured yet.
2013-10-16 23:28:08 +01:00
Steve McIntyre 700eb1571f Remove mention/support of old kfreebsd 8 kernels - they are not
created any more, and this is causing build failures.
2013-09-30 14:52:52 +01:00
Steve McIntyre 86e670195c Remove mention/support of the s390(x) tape options
Not created by d-i any more, and this is causing build failures.
2013-06-24 11:48:57 +01:00
Steve McIntyre fe25734789 List Translation files in dists/$dist/Release too - apt looks there
now instead of in Index, apparently.
2013-06-17 15:35:45 +01:00
Steve McIntyre 1da261e07e Make sure that when we call apt, we tell it to *not* use localised
package descriptions; this causes issues during build. See #712435 in
apt.
2013-06-17 15:33:46 +01:00
Steve McIntyre 4907025c1f Don't assume loadlin.exe exists. Closes: #706156
When making a custom server netinstall ISO, it may be desired to not
have MS Windows files. Unfortunately there's currently no check for
loadlin.exe, so install.bat gets created regardless. Fix this.
2013-06-13 00:04:50 +01:00
Steve McIntyre f007eaed9d Build without isolinux/desktop. Closes: #706150
debian-cd currently expects there to always be isolinux/desktop/*
files and a dtmenu.cfg file, failing if they are missing. Make it so
debian-cd can cope whether those files are present or not.
2013-06-12 23:59:33 +01:00
Steve McIntyre 5f0cdbd1ee * Start jessie work; copy things from the wheezy config for now.
* Remove older squeeze, lenny, etch dirs
2013-05-06 22:26:50 +00:00
Steve McIntyre 15f47873b4 Cosmetic tweaks to menu output 2013-04-23 17:33:03 +00:00
Steve McIntyre b24595ba88 Tweak handling of {udeb,base}_{include,exclude} files so multi-arch
builds should work better. Closes: #703436
2013-04-19 16:07:58 +00:00
Steve McIntyre 497a82d798 Allow for override of distro name etc. in grub.cfg for EFI boot too.
Closes: #705610
2013-04-19 15:01:01 +00:00
Steve McIntyre 708240f580 Add further support for missing win32-loader.ini. Closes: #705594 2013-04-19 14:52:21 +00:00
Steve McIntyre 75007ece98 * Allow for override of DISKINFO base text; Closes: #695080 2013-04-01 01:26:54 +00:00
Steve McIntyre ea5ff2d358 Remove now-redundant add_grub_entry function 2013-03-24 20:13:25 +00:00
Steve McIntyre a63e6a8de1 Don't use DISKTYPE, revert to CDROM for media type 2013-03-07 07:47:29 +00:00
Steve McIntyre f41da39ead Add missing 'fi' 2013-03-07 07:45:28 +00:00
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