Commit Graph

1354 Commits

Author SHA1 Message Date
Helge Deller 96432f4f65 Update list of required d-i packages for alpha 2016-12-10 21:47:21 +01:00
John Paul Adrian Glaubitz ae59c4e92b Declare 'my' instances of '$_' as 'local'
Fixes syntax errors on Perl 5.24 where '$_' may
no longer be declared as 'my'. Being a global symbol,
'$_' has to be declared as 'local' inside functions.
2016-11-22 11:10:35 +01:00
Steve McIntyre a55bc64a77 Add support for archives without Packages.gz and Sources.gz
Try .xz files too
2016-11-15 09:06:41 +00:00
Steve McIntyre 413b82da73 Remove obsolete dedicated_source script 2016-11-15 06:57:45 +00:00
Steve McIntyre 66154bff85 Add initial support for including backports in a build
So far only tested with a single image - targeting a netinst with some
updated packages
2016-09-20 01:46:15 +01:00
Steve McIntyre 0c6c1c04d4 Indent fixes 2016-05-10 10:17:32 +01:00
Steve McIntyre 9223ab7dbb Tweak the mtools fix again for x86 2016-05-10 10:17:19 +01:00
Steve McIntyre 7776250163 Properly fix the mtools problem 2016-05-10 10:00:27 +01:00
Steve McIntyre b41ebd8607 Add workaround for dosfstools issue (#823881) 2016-05-10 01:26:05 +01:00
Steve McIntyre cc4732add9 Also fix size calculation for EFI image for arm64 2016-05-10 01:22:45 +01:00
Philipp Hahn 1a15968a7a Fix size calculation for EFI image
CD creation fails with "disk full", because of rounding errors.

The minimum size of data-allocation is a 'cluster', which is a
power-of-two multiple of sectors.
mkfs.msdos chooses minimum FAT and cluster size for image: FAT12<16G
mkfs.msdos uses block-count where a block is 1024 B, but must be rounded
up to track_size with 32 sectors.

Round up each file to clusters before summing.
A sub-directory entry needs 1 cluster minimum.
2016-04-19 22:09:24 +00:00
Steve McIntyre c949504c2e Updates for hppa from Helge Deller
Previous changes enabled gzip compressed Linux kernels, but not 100%
sure that it works on all systems. Disable this compression for now.

Switch hppa to use xorriso by default instead of mkisofs. Xorriso
supports kernel command lines to be up to 1023 bytes, better than
mkisofs. mkisofs only supports the older palo version 4 header format
which can hold only 127 characters which might be too small.
2016-04-19 22:37:38 +01:00
Steve McIntyre a85abb62f9 Change dependency on btrfs-tools to btrfs-progs
Closes: #820479
2016-04-08 23:37:49 +01:00
Steve McIntyre 604432183b Minor updates to hurd boot. Closes: #818176
Patch from Samuel Thibault
2016-03-28 23:37:01 +01:00
John Paul Adrian Glaubitz 2c47622e76 Add list of packages required for debian-installer on sparc64.
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
2016-01-27 11:55:35 +00:00
Steve McIntyre bf2c252d98 s/http/https/ again 2016-01-14 22:08:15 +00:00
Steve McIntyre a1c501ad31 Add 686 kernels to replace 586 for i386 CDs 2016-01-04 01:16:27 +00:00
Steve McIntyre c11d247540 Change wget usage to make option handling easier
Switch all usage to $WGET, then set WGET in CONF.sh
First usage is to add --ca-directory /etc/ssl/ca-debian/ so https
certificates work.
2016-01-03 12:54:46 +00:00
Steve McIntyre c8e1b1e51d Switch references to d-i.debian.org to use https instead of http.
Closes: #809698
2016-01-03 00:37:39 +00:00
John Paul Adrian Glaubitz e756612a6d Clone and adopt boot loader script from sparc for sparc64.
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
2016-01-03 00:06:47 +00:00
John Paul Adrian Glaubitz d43c032c10 Let which_deb search silo in sparc64 instead of sparc.
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
2016-01-03 00:06:47 +00:00
Steve McIntyre b7938695a1 Cope with changes in the isolinux menus added for auto CPU detection
Previously, this code was being confused by the re-use/overloading of
existing keywords in the ifcpu64.c module and not producing any menu
entries. Now, explicitly parse the new options and pick out just the
64-bit menus as they're a strict superset of the menus in isolinux.

This may enable some more issues, e.g. people trying to load a 64-bit
kernel on a 32-bit system, but until we get some auto-detection of CPU
in grub there's not much we can do about that. Let's get *something*
working at least.
2015-11-26 00:02:55 +00:00
Steve McIntyre 9d3c82d14d List the number of grub boot entries added, as extra debug 2015-11-25 23:49:19 +00:00
Steve McIntyre ea15ee5e4e Add +x on boot-s390x after changes 2015-11-24 16:57:55 +00:00
Steve McIntyre 476838aaff Add +x on boot-s390x after changes 2015-11-13 17:07:21 +00:00
Philipp Kern 35bbcda84e Load the s390x initrd at 0x01000000 when using the ins loader.
Currently the ins loader (mostly HMC loading into an LPAR) only
supports kernels up to 8 MiB. The jessie kernel has 11 MiB, which
does not fit and hence gets its tail overwritten by the initrd
(root.bin) loaded at this address. This change bumps the load
address to 16 MiB, which should allow for some more growth of
the kernel.

Signed-off-by: Philipp Kern <pkern@debian.org>
2015-11-13 00:21:34 +00:00
Philipp Kern 479c17d917 Drop the d390oco* files.
Object code only modules date back to 2.2 and 2.4 kernel times, when
IBM did not release the source to certain kernel modules. Since many
years everything needed to boot and run the machine is actually
open source. It also got broken due to the kernel growing larger and
adding the oco.bin would overwrite parts of the kernel.

It's safe to say that nobody is actually using this.
2015-11-13 00:21:19 +00:00
Philipp Kern 59d91ccf0b Drop the remaining s390 bits from stretch and jessie.
Signed-off-by: Philipp Kern <pkern@debian.org>
2015-11-12 12:01:29 +00:00
Steve McIntyre 5e1a7fbef1 Just checksum the firmware.* files 2015-10-07 16:28:19 +01:00
Steve McIntyre 8e9ec83d72 Checksum in the right dir 2015-10-07 16:06:58 +01:00
Steve McIntyre e5b9dee3b2 Create checksums for firmware images 2015-10-07 15:36:22 +01:00
Steve McIntyre 4816b4e0af parse_isolinux: Support grub menuentry shortcuts for UEFI boot menus.
Closes: #798908
2015-10-01 18:39:57 +01:00
Steve McIntyre c8730bbda5 Remove old obsolete pre-d-i function install_language and all callers 2015-09-11 18:29:47 +01:00
Steve McIntyre fab83506a0 We don't have bootable mips CDs any more
So copy other kernel and initramfs options onto CD#1 so that end users
might actually be able to boot *something* by hand.
2015-09-11 18:26:35 +01:00
Steve McIntyre 950d33ecc2 Add kernels and other bits to armel/armhf images
Even if they won't boot directly from CD/DVD, make it easy for people
using our images by giving them all the bits they'll need to get them
booting somehow.
2015-08-27 14:27:49 +01:00
Didier Raboud 3e2382d4ad Fix booting from help files and isolinux.cfg overwriting 2015-08-21 15:11:54 +02:00
Steve McIntyre 5365734804 Add firmware bundles in cpio.gz format too to help netboot users.
Thanks to Alex Owen for the patch, slightly tweaked.
2015-08-21 10:53:44 +01:00
Didier Raboud 5a613731da Add management of arch detection from d-i in isolinux 2015-08-18 23:43:33 +01:00
Steve McIntyre a416657b2a Shorten the text used as a base for the CD VOLID if possible
Replace "alpha" with "a" and "beta" with "b". We've only got 32
characters to use here, so we need to shorten this. This way we can
specify DEBVERSION as a useful long string like "stretch-DI-alpha1" as
a version to appear in file/directory names, but without overflowing
at the VOLID level. May need more tweaks later here, but for now this
seems to do what we need.

FTAOD: this won't change "alpha" in the architecture name, as that is
added later.
2015-07-23 18:49:03 +01:00
Steve McIntyre bde884deb4 Improve the sort_deps fix for too-large packages
Make sure that the package we're told about exists before we look for
its size - a number of the dependencies and recommends may not exist
and this will cause errors for us.

Also list the configured max_pkg_size at the top of the script, to
help with debugging later.
2015-07-23 18:39:43 +01:00
Steve McIntyre 87aff198e3 tools/sort_deps: Improve handling of too-large packages
Previously, the code would only check sizes for packages explicitly
listed but packages brought in due to dependency resolution would not
be checked. Now fixed.
2015-07-21 18:46:06 +01:00
Steve McIntyre 4dd0f528fc Swap amd64 and i386 in multi-arch config; amd64 is now the default
This copes with the similar change in d-i
2015-05-13 01:38:21 +01:00
Steve McIntyre cb53d1e807 Fix handling of LOGOPNG when we've got "doppelgangers"
When we've got multiple copies of the same initramfs hard-linked
together, gzip gets unhappy when we start modifying things
later. Explicitly break the links to fix that.
2015-05-11 12:07:18 +01:00
Steve McIntyre 9dd0616b78 Remove uncompressed translation files after compressing them 2015-05-02 00:34:38 +01:00
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
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