Vladimir 'phcoder' Serbinenko
7e70395f9c
Cherrypick bugfixes and coreboot+qemu support from expermental
2010-05-17 21:35:39 +02:00
Vladimir 'phcoder' Serbinenko
918405fd8c
merge mainline into rescue-efi
2010-05-17 21:26:16 +02:00
BVK Chaitanya
8c41176882
automake commit without merge history
2010-05-06 11:34:04 +05:30
Vladimir 'phcoder' Serbinenko
7210dca942
Split coreboot and multiboot ports.
...
* conf/i386-multiboot.rmk: New file.
* configure.ac: Add multiboot port.
* include/grub/i386/multiboot/boot.h: New file.
* include/grub/i386/multiboot/console.h: Likewise.
* include/grub/i386/multiboot/init.h: Likewise.
* include/grub/i386/multiboot/kernel.h: Likewise.
* include/grub/i386/multiboot/loader.h: Likewise.
* include/grub/i386/multiboot/memory.h: Likewise.
* include/grub/i386/multiboot/serial.h: Likewise.
* include/grub/i386/multiboot/time.h: Likewise.
* include/grub/multiboot.h: Add GRUB_MACHINE_MULTIBOOT to ifdef.
* loader/multiboot.c: Likewise.
* loader/multiboot_mbi2.c: Likewise.
* util/grub-mkrescue.in: Generate multiboot rescue.
2010-05-01 14:06:53 +02:00
Vladimir 'phcoder' Serbinenko
54f83682d4
Add missing escape
2010-04-27 21:43:16 +02:00
Vladimir 'phcoder' Serbinenko
613b1b2c58
Include /grub.cfg
2010-04-27 13:44:39 +02:00
Vladimir 'phcoder' Serbinenko
ff6bea78b4
Enable pathspecs
2010-04-27 13:22:38 +02:00
Vladimir 'phcoder' Serbinenko
13ac43057b
use uuids on efi
2010-04-27 11:08:53 +02:00
Vladimir 'phcoder' Serbinenko
19ba92760a
merge merge-mkimage into rescue-efi
2010-04-27 10:47:29 +02:00
Vladimir 'phcoder' Serbinenko
88d046d01e
Switch to new grub-mkimage syntax
2010-04-26 21:27:41 +02:00
Vladimir 'phcoder' Serbinenko
614be3f119
#if-less grub-mkimage
2010-04-26 00:45:21 +02:00
Vladimir 'phcoder' Serbinenko
bc05c2cb2c
Change to xorrisofs. Make message more clear.
2010-04-24 21:08:25 +02:00
Vladimir 'phcoder' Serbinenko
260ddb9417
create a fat16 image as efi spec requires
2010-04-17 16:43:04 +02:00
Vladimir 'phcoder' Serbinenko
1989170fd5
merge mainline into rescue-efi
2010-04-17 02:32:05 +02:00
BVK Chaitanya
b02c7c8fb5
added getopt like error for missing option parameters
2010-04-12 21:33:03 +05:30
BVK Chaitanya
8f33d5549f
merged with mainline
2010-04-12 20:47:25 +05:30
Vladimir 'phcoder' Serbinenko
4777971126
* util/grub-mkrescue.in: Fix incorrect path in coreboot part.
...
Reported by: Thomas Schmitt.
Add -no-emul-boot to grub-mkisofs parameters.
2010-04-09 20:40:14 +02:00
BVK Chaitanya
c45d352721
merged in mainline
2010-03-22 17:16:31 +05:30
Thorsten Glaser
d68b491ee2
* util/grub-mkrescue.in: Base ISO UUID on UTC.
2010-03-14 13:48:55 +01:00
Vladimir 'phcoder' Serbinenko
33e2e6f373
2010-03-06 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/grub-mkrescue.in: Use mktemp with explicit template.
2010-03-06 17:28:25 +01:00
BVK Chaitanya
7a64e28d0e
fixed mkconfig and mkrescue scripts
2010-02-07 10:14:50 +05:30
Vladimir 'phcoder' Serbinenko
ac0289ba92
grub-mkrescue for EFI (untested)
2009-12-29 11:24:13 +01:00
Felix Zielcke
990f35486e
2009-12-22 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkrescue.in (pkglib_DATA): Set to @pkglib_DATA@.
* genmk.rb (class SCRIPT): Modify the target file instead of source.
2009-12-22 18:20:27 +01:00
Felix Zielcke
10a8879783
2009-12-22 Felix Zielcke <fzielcke@z-51.de>
...
* genmk.rb (class SCRIPT): Use sed to substitute @pkglib_DATA@
with the actual contents of the correspondending make variable.
* util/grub-mkrescue.in (pkglib_DATA): New variable.
(process_input_dir): Copy all $pkglib_DATA files instead of explicitly
specifying `*.lst' and `efiemu??.o'
2009-12-22 12:12:51 +01:00
Felix Zielcke
4dd13225a0
2009-12-21 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkrescue.in: (process_input_dir): Copy `*.lst' files
instead of specifying them explicit.
2009-12-21 22:19:25 +01:00
Robert Millan
9b214e3a53
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* util/mkisofs/msdos_partition.h: New file (based on
include/grub/msdos_partition.h).
* util/mkisofs/mkisofs.c (use_protective_msdos_label): New variable.
(OPTION_PROTECTIVE_MSDOS_LABEL): New macro.
(ld_options, main): Recognize --protective-msdos-label.
* util/mkisofs/mkisofs.h (use_protective_msdos_label): New declaration.
* util/mkisofs/write.c: Include `"msdos_partition.h"'.
(padblock_write): If `use_protective_msdos_label' is set, patch a
protective DOS-style label in the output image.
* util/grub-mkrescue.in: Use --protective-msdos-label.
2009-12-21 20:22:12 +00:00
Robert Millan
e930981361
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-mkrescue.in: Do not zero-pad image for BIOS-based disk
boot.
2009-12-21 19:10:07 +00:00
Robert Millan
0ae5692966
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* util/mkisofs/mkisofs.c (use_embedded_boot, boot_image_embed): New
variables.
(ld_options, main): Recognize `--embedded-boot'.
* util/mkisofs/mkisofs.h (use_embedded_boot, boot_image_embed): New
declarations.
* util/mkisofs/write.c (PADBLOCK_SIZE): New variable.
(padblock_size): Use `PADBLOCK_SIZE' instead of hardcoding 16.
(padblock_write): Likewise. Rewrite to support embedded boot image.
* util/grub-mkrescue.in: When building i386-pc images, embed core.img
for BIOS-based disk boot instead of only ElTorito.
2009-12-21 17:40:26 +00:00
Robert Millan
b15937b110
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-mkrescue.in: Remove `configfile' and `sh' from i386-pc
build (not needed for bootstrap).
2009-12-21 17:03:08 +00:00
Robert Millan
52cc3ce041
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-mkrescue.in: Remove `memdisk', `tar' and `search' modules
from i386-pc build (not needed for bootstrap).
Rewrite a pair of strings.
2009-12-21 16:11:35 +00:00
Carles Pina i Estany
57bbe3beb1
2009-12-05 Carles Pina i Estany <carles@pina.cat>
...
* util/grub-install.in: Install gettext .mo files.
* util/grub-mkrescue.in (process_input_dir): Copy gettext .mo files.
2009-12-05 09:31:36 +00:00
Felix Zielcke
74ff1dd52b
2009-11-21 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkrescue.in: Print an error and usage if output option
has not been given.
2009-11-21 17:40:55 +01:00
Robert Millan
13774a2f94
2009-11-21 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-mkrescue.in: Use source directory direcly (without copiing
or hardlinking it). Remove -J option, Joliet is not compatible with
multiple source directories.
2009-11-21 13:22:41 +00:00
Robert Millan
efda854e68
2009-11-21 Carles Pina i Estany <carles@pina.cat>
...
2009-11-21 Robert Millan <rmh.grub@aybabtu.com>
* util/grub-mkrescue.in: Recognize `--override-directory' option.
(process_input_dir): New function. Process an arbitrary input
directory.
Misc adjustments to support both "override mode" and system-wide mode.
2009-11-21 13:11:38 +00:00
Robert Millan
fc2208b0ef
2009-11-14 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/i386-coreboot.rmk (grub_mkrescue_SOURCES): Replace
`util/i386/coreboot/grub-mkrescue.in' with `util/grub-mkrescue.in'.
* conf/i386-pc.rmk (grub_mkrescue_SOURCES): Replace
`util/i386/pc/grub-mkrescue.in' with `util/grub-mkrescue.in'.
(bin_SCRIPTS): Add `grub-mkfloppy'.
(grub_mkfloppy_SOURCES): New variable.
* util/grub-mkrescue.in: New file.
* util/i386/pc/grub-mkfloppy.in: New file.
* util/i386/coreboot/grub-mkrescue.in: Remove.
* util/i386/pc/grub-mkrescue.in: Remove.
2009-11-14 18:38:11 +00:00