vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4178 commits 7 branches 0 tags 72 MiB
Commit graph

55 commits

Author SHA1 Message Date
BVK Chaitanya
16c7cb32c8 merge with mainline 2010-08-19 16:54:00 +05:30
Colin Watson
ea9be8eadb * util/grub-mkrescue.in: Remove ${efi_dir} after building efi.img. 2010-08-01 11:30:03 -05:00
BVK Chaitanya
297f0c2b6e merge with mainline 2010-07-13 00:43:28 +05:30
Vladimir 'phcoder' Serbinenko
3eaac1a13e * util/grub-mkrescue.in: Don't use tar GNU-ism since it's not necessary 
in this context.
 2010-07-10 02:15:49 +02:00
Vladimir 'phcoder' Serbinenko
b0c4f95642 * util/grub-mkrescue.in: Avoid module duplication. 2010-07-01 23:35:45 +02:00
Colin Watson
1246efeb8b * util/grub-mkconfig.in: Use 'set -e' rather than '#! /bin/sh -e', 
to avoid accidents when debugging with 'sh -x'.
* util/grub-mkrescue.in: Likewise.
* util/grub.d/00_header.in: Likewise.
* util/grub.d/10_hurd.in: Likewise.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
* util/grub.d/10_netbsd.in: Likewise.
* util/grub.d/10_windows.in: Likewise.
* util/grub.d/20_linux_xen.in: Likewise.
* util/grub.d/30_os-prober.in: Likewise.
* util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
 2010-06-29 16:20:49 +01:00
BVK Chaitanya
b2ffba9c08 merge with mainline 2010-06-12 20:25:26 +05:30
Thomas Schmitt
ce08a9fb28 * util/grub-mkrescue.in: Pass unrecognized options to xorriso. 2010-06-12 16:03:34 +02:00
Thomas Schmitt
a608597318 * util/grub-mkrescue.in: Support --xorriso argument. 2010-06-12 13:54:35 +02:00
Vladimir 'phcoder' Serbinenko
25c56d2928 * util/grub-mkrescue.in: Use -graft-points instead of -pathspecs. 
Suggested by: Thomas Schmitt.
 2010-06-12 13:47:08 +02:00
Vladimir 'phcoder' Serbinenko
e03e4b24ca * util/grub-mkrescue.in: Add --sort-weight arguments to xorriso. 
Suggested by: Thomas Schmitt.
 2010-06-12 13:44:01 +02:00
Colin Watson
ee62c427e5 * util/grub-mkrescue.in (make_image): Remove sh module, which has 
been merged back into normal.
 2010-06-12 12:02:38 +01:00
BVK Chaitanya
d6d0c209d9 merge with mainline 2010-06-12 16:21:10 +05:30
Grégoire Sutre
0ea7c4f93c Make --version uniform and avoid hard-coded program name. 2010-06-08 12:52:42 +02:00
BVK Chaitanya
fe16b84557 pull-in emu-lite 2010-06-01 09:12:01 +05:30
Colin Watson
d1d368e426 * util/grub-mkrescue.in: Initialise override_dir rather than 
assuming that it's unset or empty in the environment.
 2010-05-27 12:43:22 +01:00
BVK Chaitanya
692d7c2855 pull-in emu-lite branch 2010-05-26 17:49:05 +05:30
Vladimir 'phcoder' Serbinenko
26966aeba7 2010-05-18 Vladimir Serbinenko <phcoder@gmail.com> 
* util/grub-mkrescue.in: Remove -O i386-pc duplication.
	Reported by: Seth Goldberg.
 2010-05-18 14:21:15 +02:00
Colin Watson
7fb5c25fd0 * util/grub-mkrescue.in: Sync up with grub-install in terms of how 
we handle finding grub-mkimage.  Default to finding grub-mkimage in
${bindir} with program_transform_name applied, and provide a
--grub-mkimage option to override this.
 2010-05-18 11:51:37 +01:00
Vladimir 'phcoder' Serbinenko
8b26d1d30b add missing sh.mod 2010-05-17 22:23:22 +02:00
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