Commit Graph

1382 Commits

Author SHA1 Message Date
Steve McIntyre 44ea4bc0e3 Add grub-efi packages to armhf media 2019-02-11 16:37:39 +00:00
Samuel Thibault 3a588e90a5 Support dark theme boot entries 2019-02-08 18:52:37 +01:00
Steve McIntyre dc48123273 Revert "start_new_disc: correct disk/cd-type for all types"
This reverts commit 15b482d49e.

Undo this change for now, as it's causing unexpected issues in
d-i. Changes here need to match up with the code in apt-setup to make
sure we get sensible behaviour all round.

Revisit this after the d-i alpha 5 relese.
2019-01-25 23:58:47 +00:00
Steve McIntyre a7328f65da Merge branch 'system' into 'master'
make_disc_trees: don't use system() for trivial things

See merge request images-team/debian-cd!2
2019-01-23 23:04:57 +00:00
Julien Cristau c68062b624 make_disc_trees: don't use system() for trivial things
Fair warning: completely untested and I don't know perl.
2019-01-23 23:50:36 +01:00
Julien Cristau 97dbce1c22 make_disc_trees: don't reopen the log over and over 2019-01-23 23:34:01 +01:00
Holger Levsen 6114c16dfc include/exclude more packages for Edu BD image
Thanks to Wolfgang Schweer for the patch.

Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-01-15 18:45:31 +01:00
Steve McIntyre 3e0615992c Tweak the EFI dir naming 2019-01-15 12:59:13 +00:00
Steve McIntyre 6fb5c246d8 Make mcopy calls less verbose
Turned on when debugging, not needed now
2019-01-13 18:25:42 +00:00
Steve McIntyre bda51b7d31 Drop grub-legacy from the core package list
For real, this time :-(
2019-01-13 16:59:31 +00:00
Holger Levsen 15b482d49e start_new_disc: correct disk/cd-type for all types
Thanks to Wolfgang Schweer for the patch. See/Closes: #846006

Signed-off-by: Holger Levsen <holger@layer-acht.org>
2019-01-11 14:54:51 +01:00
Steve McIntyre 10f26b6523 Explicitly bring in the signed shim and grub bootloaders
Let's make UEFI Secure Boot work well
2019-01-10 21:40:00 +00:00
Steve McIntyre f0375b21ea Munge the EFI boot support code to make Secure Boot work
We don't need to do much here, just pass on what the d-i build already
set up for us. Previously, we assumed too much knowledge about the
contents of the efi.img we were given. Now simply copy all of it.

(This is only really necessary due to us wanting to merge the efi.img
 for multiple architectures. This is likely to get harder with
 clashing files... :-/)
2019-01-10 21:31:19 +00:00
Steve McIntyre bd0a1107c7 For now, hard-code linux-image=* in backports support
Keep the normal kernel on media *as well as* a backports kernel. d-i
will install the normal one first, then later upgrade it.
2018-08-14 00:35:53 +01:00
Steve McIntyre 31ec2cb178 Fix typo in comment 2018-08-13 15:26:54 +01:00
Steve McIntyre 5710321f9e Add proper backports support in generate_firmware_task
When BACKPORTS is defined, look for firmware in $codename-backports
first, then in $codename
2018-08-13 14:36:36 +01:00
Steve McIntyre 5dd0d5cc2a Fix silly typo 2018-08-13 14:07:51 +01:00
Holger Levsen 7bcfbfa23b try to keep all the desktops on the BD image, which was down to 3GB already
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2018-08-09 00:22:09 +02:00
Steve McIntyre 814b0dd97c Fix generate_debian-edu_task again
Fix syntax errors
Switch the ignore code to walking a list instead
2018-08-01 11:01:33 +01:00
Holger Levsen 1d955ed12c education-desktop-other is needed for the full edu image
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2018-07-31 22:44:23 +08:00
Holger Levsen fa9bf61204 exclude a bunch of desktops from the full edu image
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2018-07-31 15:50:42 +08:00
Steve McIntyre 60f1e082d8 Replace generate_debian-edu_task with a perl script parsing Packages
Apt setup hasn't happened yet, so we can't use the apt
wrapper. Instead, use simple perl code derived from
generate_firmware_task.
2018-07-31 03:33:33 +01:00
Steve McIntyre adb7d349b8 Fix up shell errors in generate_debian-edu_task 2018-07-31 01:24:32 +01:00
Holger Levsen d2e89a1938 create a debian-edu task to be able to build an offline installation image
Signed-off-by: Holger Levsen <holger@layer-acht.org>
2018-07-30 16:21:19 +08:00
John Paul Adrian Glaubitz c86bc763e3 Use compressed kernel image by default in boot-hppa 2018-05-08 11:25:31 +02:00
David Kalnischkies 270eabfa43 Provide hashes for uncompressed Translation-* again
Implemented in 2f34797490 for bug #767253
released a few months later in v3.1.17, but then broken again a few days
later in 9dd0616b78 by removing the
uncompressed files too early.
2018-02-16 16:14:29 +00:00
Steve McIntyre 3575f5f24e Re-indent to clean up 2018-02-15 16:18:21 +00:00
Steve McIntyre 9754353070 Also generate checksums for torrent files 2018-02-15 16:17:57 +00:00
Steve McIntyre 2d002fac5e List jigdo and template files in SUMS files too 2018-02-11 21:13:56 +00:00
Steve McIntyre b774eb3535 lose extra - on -joliet-long 2018-02-10 12:11:05 +00:00
Steve McIntyre 6112370e0a Ensure that in all places where we use -J we also use --joliet-long
Thanks to Thomas Schmitt again for a clear bug report!
2018-02-10 00:29:15 +00:00
Steve McIntyre 915ea96579 Remove the executable bit from various shell function files 2018-02-04 00:53:48 +00:00
Vagrant Cascadian aca40b24ec Support KERNEL_PARAMS in arm64 (Closes: #884552) 2018-02-04 00:37:35 +00:00
Steve McIntyre 8714e849ad Fix isolinux config parsing. Thanks to Philipp Hahn for the patch.
Closes: #886655
2018-02-04 00:30:08 +00:00
Steve McIntyre 013d09f686 Make update_popcon cope with https on popcon.d.o
Tell curl to follow redirects
Add explicit capath argument if needed, as on debian.org machines
2017-11-20 21:27:25 +00:00
Steve McIntyre 078be0016d When we have more than one source version, list all the sources rather than just the first version 2017-10-20 23:26:28 +01:00
Steve McIntyre 279c304f89 Fix up the 'unreleased' addition 2017-10-12 11:06:07 +01:00
Steve McIntyre aa87a2910a Make tools/update_popcon exit with errors when it fails 2017-10-10 15:15:14 +01:00
John Paul Adrian Glaubitz b03cbd1904 Add unreleased to component list in tools/generate_di_list 2017-10-08 22:04:03 +02:00
John Paul Adrian Glaubitz 664ed6c3d1 Add unreleased to dist search list in find_pkg_file() 2017-10-08 22:02:54 +02:00
John Paul Adrian Glaubitz 995a8198b9 Add initial set of packages to tools/generate_di+k_list on ppc64 2017-10-08 20:18:06 +02:00
John Paul Adrian Glaubitz 90d2b27cc0 Fix install location of amiga.info icon file 2017-10-05 23:56:26 +02:00
John Paul Adrian Glaubitz c11f01d765 Add grub-ieee1275 to tools/generate_di+k_list on sparc and sparc64 2017-09-29 14:22:24 +02:00
John Paul Adrian Glaubitz 6995bade4c Add grub-ieee1275 to tools/generate_di+k_list on powerpc 2017-09-29 14:21:14 +02:00
John Paul Adrian Glaubitz d2a4f9c9c2 Strip "images/cdrom" suffix from mirror DI_DIR path in boot-alpha 2017-09-29 14:13:41 +02:00
John Paul Adrian Glaubitz 4c8b55f6fe Fix relative d-i path for kernel images and initrd in boot-alpha 2017-09-08 10:56:14 +02:00
John Paul Adrian Glaubitz eb68c7621b Add support for unreleased packages from Debian Ports 2017-09-07 22:19:13 +02:00
John Paul Adrian Glaubitz 2b9b429245 Fix relative d-i path for kernel images and initrd in boot-sparc64 2017-09-06 14:13:51 +02:00
John Paul Adrian Glaubitz 9bfd41c22b Fix relative d-i path for kernel images and initrd in boot-hppa 2017-09-06 13:54:37 +02:00
John Paul Adrian Glaubitz 96691923d8 Remove special handling for palo, silo and yaboot in which_deb 2017-09-06 13:20:00 +02:00
John Paul Adrian Glaubitz 47f7b12a36 Add support for unreleased packages from Debian Ports 2017-09-06 13:06:45 +02:00
John Paul Adrian Glaubitz 3fe6be32a9 Add list of packages required for debian-installer on m68k. 2017-09-01 16:22:46 +02:00
Steve McIntyre 6261303061 Add SHA256 in the Packages files too 2017-08-05 16:27:41 +01:00
Steve McIntyre 00eb0a453e More buster setup 2017-06-19 14:07:09 +01:00
Steve McIntyre f2d86bff11 Start buster, simply copying stretch for now 2017-06-19 14:00:05 +01:00
Steve McIntyre 18601b1d00 Fix handling of dedications 2017-06-19 13:36:02 +01:00
Steve McIntyre f7b6bd056d More logging around whether to add release notes or not 2017-06-14 20:27:10 +01:00
Steve McIntyre abb116f60b Tweak the Volume ID for mips64el media
Make them fit for stretch d-i rc4
2017-05-26 22:50:11 +01:00
Steve McIntyre 75699b6914 Fix netinst check - use NETINST 2017-05-19 23:35:59 +01:00
Steve McIntyre d1e5b47a45 Tweak the Volume ID and disk info output slightly for netinst media
Closes: #858031
2017-05-18 23:38:30 +01:00
Steve McIntyre d27ad83a12 Use DISKTYPE rather than INSTALLER_CD for working out what to do
It's much more sensible, and there's a profusion of INSTALLER_CD
options now. Let's stop tracking those in start_new_disc...
2017-05-18 23:36:26 +01:00
Steve McIntyre 4f1eb18328 Deal with more netinst build options 2017-05-18 23:22:42 +01:00
Steve McIntyre 97bc2c3dac Refactor boot scripts
Move sourced/shared scripts to boot-*-common
Rearrange common definitions in each boot script to make them more
similar
Add common support for %ARCH% substitutions in DI_WWW_HOME
Fix boot-alpha to use which_deb when looking for aboot
Merge mips* together, using boot-mips-common
2017-05-03 18:02:29 +01:00
Steve McIntyre cdc52554e0 Ensure that arm64 images include grub-efi packages 2017-05-03 16:02:51 +01:00
Steve McIntyre 3fce3f7d98 more boot script cleanups 2017-05-03 11:31:46 +01:00
Steve McIntyre b6b7c3801a Refactor the non-cd-booting code
we've already got code to copy the d-i images into a handy place for
users. Move it into a common function and reference that for all the
arches affected.
2017-05-03 10:51:13 +01:00
Steve McIntyre 8ab1d6933c Drop ancient references to NONUS 2017-05-03 10:40:34 +01:00
Steve McIntyre 9815b0abe3 Add stub for mips64el boot support, so we can build images for it 2017-05-02 23:43:15 +01:00
Samuel Thibault 65e2a1c89b Fix parsing nested menus 2017-04-18 02:13:07 +02:00
Steven Chamberlain 2b46d5bb72 Fix update_tasks on non-Linux arches
In the filename of the coreutils .deb, the architecture part
may also contain a hyphen in the case of hurd-i386 or
kfreebsd-*
2017-04-12 20:23:36 +01:00
Steven Chamberlain d62734ee71 Fix which_deb handling of non-Linux arches
When which_deb finds "*i386" or "*amd64" entries in the ARCHES list,
it will wrongly change them to "i386" to "amd64" respectively (which
is wrong in the case of kfreebsd-* or hurd-*).

Make the same changes here that were already made to identical code in
generate_di_list, to fix #758512 (commits
771f754516 and
2ef5d3288c).
2017-04-12 20:23:31 +01:00
Samuel Thibault 5946c6ef32 Add support for grub submenu hotkeys 2017-03-29 02:48:12 +02:00
Steve McIntyre a3aef842ad Bugfix: fix the remove_Packages_entry() helper function
This was a bug introduced with the backports support. Lots of the
internal helper functions take 4 arguments now: ($dir, $arch,
$in_backports, $package_info). That's fine, but I forgot to update the
code in remove_Packages_entry() to deal with the $in_backports
argument.

This led to the md5sums.txt files in multi-disc sets being broken -
the last file(s) removed on a given disc would still be listed in the
md5sums.txt file, even though the file itself had been removed.
2017-03-27 20:40:19 +01:00
Cyril Brulebois b9e64d5c08 Fix missing end of comment. 2017-02-15 14:25:36 +01:00
Steve McIntyre d14c28f4c6 Move https bits from forcd1 to debian-installer+kernel task file
As pointed out by pkern, we need them on netinst media too.

Also removed the old mention of businesscard media in the top of
forcd1 - they've been gone for ages
2017-02-15 12:58:39 +00:00
Steve McIntyre 2928846080 Fix missing full pah for catz call 2017-02-14 23:32:08 +00:00
Raphaël Hertzog 69e54c84a5 Add {data,tasks,tools/boot}/{kali-dev,kali-rolling} symlinks
Those symlinks make it easier to build Kali images with debian-cd.
They are pointing to "sid" so that they are automatically updated
when the underlying symlink is updated. It makes senses since Kali
is a rolling distribution based on Debian Testing.
2017-01-27 14:01:11 +01:00
Helge Deller b35b0acf0b Add list of required d-i packages for hppa 2016-12-10 21:48:05 +01:00
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