Commit Graph

1160 Commits

Author SHA1 Message Date
Steve McIntyre 1228b3724a Make 'sid' use stretch data etc. 2015-04-28 13:30:35 +01:00
Steve McIntyre ae3d40e866 Start stretch development 2015-04-27 17:14:26 +01:00
Steve McIntyre 0ad2c2dbdb Fix up the partitioning for arm64 images so USB will work again
This code was using "-efi-boot-part", which works fine for booting but
creates images that d-i can't use: only the full disk or the ESP
partition would contain working filesystems, and d-i doesn't like that.

Instead, switch to appending the ESP as an extra partition on the end
of the image. This will take a small amount of extra space, but will
at least work reliably!
2015-04-16 15:24:01 +01:00
Steve McIntyre 8248615c03 Add rdnssd on disc 1 by default. Closes: #782299 2015-04-11 10:33:01 +01:00
Helge Deller 39bdaf29b2 alpha: fix unpacking aboot-base, copy versioned vmlinuz file correctly. 2015-02-28 22:59:01 +01:00
Steve McIntyre e799e742c0 Improve autorun.inf, make sure the disc icon displays
Closes: #772691. Thanks to jnqnfe for initial patch, slightly tweaked.
2015-02-17 06:30:28 +00:00
Steve McIntyre 4e5ef691c4 Update kernel and related package lists for mips
Closes: #777711
2015-02-12 02:15:35 +00:00
Steve McIntyre a46cc618f8 Indent cleanup 2015-02-05 00:18:41 +00:00
Steve McIntyre 6ada498416 More consistent debug message 2015-02-05 00:18:41 +00:00
Steve McIntyre 218757dd6f Major refactor for better control of choice of EFI and BIOS boot
Split the code up and use BOOT_EFI and BOOT_BIOS to control which
goes where. We now support:

 * BOOT_BIOS=1 BOOT_EFI=0 for BIOS boot only via an ElTorito boot
   record (like debian-cd used to be before EFI support was added)

 * BOOT_BIOS=1 BOOT_EFI=2 for standard BIOS boot as
   primary ElTorito boot record and EFI as an alternate ElTorito boot
   record (common case, just like we've been doing for amd64 in
   debian-cd for a while)

 * BOOT_BIOS=0 and BOOT_EFI=1 for *only* EFI boot as the primary
   ElTorito boot record (new case, might be useful for some
   Macs *maybe*)

Set BOOT_METHODS in the debian-cd environment to determine which of
these cases is desired in a given build.

Also removed the support for the "old" syslinux packaging layout, it's
not been around for a while now.
2015-02-05 00:18:40 +00:00
Steve McIntyre 26015951f6 Remove isolinux message - no longer needed 2015-02-05 00:18:40 +00:00
Steve McIntyre d2b08bb059 Factor out the code for EFI boot slightly
Only use -eltorito-alt-boot when we need to
2015-02-05 00:18:40 +00:00
Steve McIntyre aff1c7700d If we're only doing EFI, copy the splash file from the BIOS boot dir 2015-02-05 00:18:40 +00:00
Steve McIntyre e4a3987cbe Remove old mentions of floppy in the code 2015-02-05 00:18:40 +00:00
Steve McIntyre fc10046fba Add extra options to control boot options on x86 CDs 2015-02-05 00:18:40 +00:00
Steve McIntyre b228286310 Clean up arm64 boot stuff
Remove un-needed boot$N in the xorriso command line, we don't have
crappy BIOS lomitations.
Remove support for older xorriso versions.

Use new -efi-boot-part --efi-boot-image options to make an
isohybrid-style images with an explicit EFI partition. Will hopefully
make d-i happier with our images from USB.
2015-01-31 10:59:04 +00:00
Steve McIntyre e5e09cffd5 eplace %ARCH% with the arch name
Extra feature, helpful for testing multi-arch CD builds
2015-01-11 00:43:27 +00:00
Steve McIntyre 322339fb4d Force overwrite when creating efi.img boot files 2015-01-11 00:41:31 +00:00
Steve McIntyre a3c80cd032 Copy all boot files out of efi.img - added for i386-efi support 2015-01-11 00:40:15 +00:00
Steve McIntyre cb1b553227 Show all possible kernels - needed for i386-efi 2015-01-11 00:36:59 +00:00
Steve McIntyre 74d62ec35c Remove over-verbose debug 2015-01-11 00:15:58 +00:00
Steve McIntyre 2900545769 Change from -- to --- for kernel command line handling
Closes: #764676
2014-11-06 12:55:59 +00:00
Steve McIntyre 09363728c3 Fix logic for %install% editing 2014-11-05 14:18:53 +00:00
Steve McIntyre f256a86827 More fixups for arm64 CD builds
* Actually put the kernel and initramfs on the CD (doh!)
 * Replace the %install% variables with real paths
2014-11-05 13:58:04 +00:00
Steve McIntyre 7c0db7034b Add 586 kernels to replace 486 for i386 CDs 2014-10-31 15:27:13 +00:00
Steve McIntyre 2f34797490 Tweak handling of (un)compressed index files
Provide hashes for uncompressed Translation-* files, and remove the
uncompressed versions from the output disc. Closes: #767253. Initial
patch from Michael Vogt - thanks!
2014-10-30 02:12:12 +00:00
Steve McIntyre 047b07e779 Do not look for isolinux/desktop/*cfg files
d-i has removed these files now, so don't look for them for kernel
params. Closes: #767223, #766411. Thanks to Prema and Vagrant for
(identical!) patches. :-)
2014-10-29 17:28:12 +00:00
Steve McIntyre dceb0d9b67 Fix typos 2014-10-05 09:14:24 +01:00
Aurelien Jarno dc873f6374 Add the ppc64el kernel on the first CD
Due to a typo the ppc64el kernel wan't present on the first CD.
2014-10-04 16:23:26 +01:00
Aurelien Jarno cd1f0736fd Enable CHRP partition table on ppc64el boot CD
The test is on a file, so it should use -f instead of -d.
2014-10-04 16:23:21 +01:00
Steve McIntyre 550a9a4edc Update header comments in boot-arm64 2014-10-04 16:21:51 +01:00
Steve McIntyre 775d4ecfe0 The d-i supplied grub.cfg has the correct entries in it already 2014-10-04 16:20:37 +01:00
Steve McIntyre 840d549c8c Tweak ppc64el boot stuff: depend on xorriso 2014-10-03 14:13:03 +01:00
Aurelien Jarno 77387b5419 Add initial support for ppc64el 2014-10-03 00:56:48 +01:00
Steve McIntyre adad6af07d Point back to central arm64 d-i bits 2014-09-27 14:22:10 +01:00
Steve McIntyre e94ad0c760 Add experimental support for arm64 booting via UEFI 2014-09-27 02:40:05 +01:00
Steve McIntyre 6d7bcaf0bb Extend FORCE_SID_TASKSEL usage in update_tasks
Also affect desktop choice algorithm
2014-09-26 23:40:04 +01:00
Joey Hess b494adcb03 adapt desktop handling for tasksel/d-i changes
tasksel now allows selecting the desktop, and d-i has dropped the boot
menu desktop selection, so we no longer need to have desktop boot
menus on CDs.

CD images for specific desktops (xfce/kde/mate/etc) should still
override the default tasksel desktop.
2014-09-26 23:39:52 +01:00
Steve McIntyre 3d2e1f7fc2 Update kernel flavours for armhf to just use armmp and armmp-lpae 2014-09-21 18:02:21 +01:00
Steve McIntyre 049506d313 Add initial support for arm64
Non-booting yet, copying and extending armhf for now.
2014-09-21 17:57:59 +01:00
Steve McIntyre 2ef5d3288c Fix word-splitting regexp in generate_di_list.
Closes: #758512. Thanks to Philipp Hahn for the patch.
2014-08-20 14:24:38 +01:00
Steve McIntyre 6d623c6b88 Another try to sort out desktop settings for the Gnome CD 2014-08-07 02:31:21 +01:00
Steve McIntyre 8d39e31372 Fix up Gnome CD set installing xfce; Closes: #756774 2014-08-07 01:57:28 +01:00
Steve McIntyre e4fdc94a23 Remove mention of delo.2nd from hppa boot script
Must have been a cut and paste error from a mips script. :-(
2014-05-30 12:08:51 +01:00
Steve McIntyre e53f3e1ad6 Cope with changes from move to isolinux 6.x. Closes: #746746 2014-05-18 01:31:29 +01:00
Steve McIntyre 17af9c76a1 Update from kfreebsd-9 to kfreebsd-10 2014-05-12 15:45:39 +01:00
Steve McIntyre 7a819f9120 Remove typo from the xorriso_version code 2014-04-09 10:33:47 +01:00
Steve McIntyre 348f4b31d1 Remove broken trailing space from cut and paste error 2014-04-09 02:24:44 +01:00
Steve McIntyre c0813db7f7 Fixes for booting on hppa architecture. Closes: #743879 2014-04-08 18:44:36 +01:00
Steve McIntyre 6b0e67d201 Factor out the xorriso version-checking code 2014-04-08 18:32:13 +01:00
Steve McIntyre ec29afa4cf Bugfix: work on multi-arch enabled build systems 2014-04-08 18:18:44 +01:00
Raphaël Hertzog 0cfa70e113 Fix code extracting the xorriso version
The code was assuming that the first line of output was something like
this (and this is the case of the cd builder machine that uses a custom
built xorriso):
> GNU xorriso 1.2.6 : RockRidge filesystem manipulator, libburnia project.

But the output of the version packaged in Debian does not have the GNU
string:
> xorriso 1.3.2 : RockRidge filesystem manipulator, libburnia project.

We fix this issue by extracting the version from the line starting with
"xorriso version" which does not have this discrepancy.
2014-03-27 15:55:36 +01:00
Steve McIntyre 78b84f92a9 Make kfreebsd & hurd images usbkey-bootable. Closes: #739422
debian-installer now has extra steps to create a grub_embed file which
can be passed to xorriso's --embedded-boot option. Add corresponding
code in debian-cd to use it to make images USB bootable.

Patch from Samuel Thibault.
2014-02-19 00:03:19 +00:00
Steve McIntyre 57fe59f92f Add "UEFI" text to the UEFI installer menu title
to make it easier for end users to distinguish between UEFI and BIOS
boot.
2014-02-11 01:59:54 +00:00
Steve McIntyre 546559365e Fix syntax bug in try_di_image_cache()
Add warnings if download links we're using are insecure (i.e. not
https). May turn these into errors later...
2013-12-16 15:15:53 +00:00
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