fe16b84557
pull-in emu-lite
2010-06-01 09:12:01 +05:30
64c10cde57
merge with mainline
2010-05-28 16:23:07 +05:30
d870813427
* util/grub-script-check.c (main): Ensure defined behaviour on empty
...
input files (in which case exit zero).
2010-05-27 15:54:18 +01:00
5fdba519bb
2010-05-27 Robert Millan <rmh@gnu.org>
...
* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Insert
partmap module to handle cross-partmap setups.
Reported by Orestes Mas. Gràcies!
2010-05-27 16:38:16 +02:00
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
692d7c2855
pull-in emu-lite branch
2010-05-26 17:49:05 +05:30
066e9dd87e
pull-in emu-fixes branch
2010-05-26 09:58:23 +05:30
5f02926bbc
emu build fixes for sparc64 and freebsd
2010-05-26 09:56:59 +05:30
a6b1d2075e
merge with mainline
2010-05-25 17:11:24 +05:30
e9c5186cf8
merge with mainline
2010-05-25 16:09:03 +05:30
76e6d0d767
Add default/grub support
2010-05-23 14:11:11 +02:00
21717c8fca
* util/grub-mkconfig.in: Fix handling of -o so that it works when
...
not the first option.
2010-05-21 14:17:15 +01:00
c0f48e654d
* util/grub-mkrelpath.c (usage): Remove excess apostrophe.
2010-05-20 23:27:15 +01:00
96779aec8e
* util/misc.c: Move inclusion of <limits.h> to ...
...
* kern/emu/misc.c: ... here. Needed for canonicalize_file_name.
2010-05-20 23:16:10 +01:00
526397f415
merge with mainline
2010-05-20 14:52:25 +05:30
74276c0df7
* util/grub.d/10_windows.in: Use path names instead of
...
drive letters to prevent warning from Cygwin 1.7.
Add drivemap command to menuentry if needed.
2010-05-18 21:58:49 +02:00
c4f7b52359
2010-05-18 Justus Winter <4winter@informatik.uni-hamburg.de>
...
* util/grub.d/10_hurd.in: Include all gnumach* kernels, not only
gnumach and gnumach.gz.
2010-05-18 20:10:37 +02:00
01b8d2d787
* Makefile.in (CPPFLAGS): Replace -DGRUB_LIBDIR with
...
-DGRUB_PKGLIBROOTDIR= and prepend @PACKAGE_TARNAME@. All users updated.
* util/grub-mkimage.c (image_targets): Add i386-multiboot.
(main): Add a slash after pkglibdirroot.
2010-05-18 13:55:26 +02:00
654e1d1e0e
* util/grub-install.in: Add missing "in" keyword.
2010-05-18 13:45:25 +02:00
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
74cbf5bdcb
* configure.ac: Check for Linux device-mapper support.
...
* util/hostdisk.c (device_is_mapped): New function.
(find_partition_start): New function, partly broken out from
linux_find_partition and grub_util_biosdisk_get_grub_dev but with
device-mapper support added.
(linux_find_partition): Use find_partition_start.
(convert_system_partition_to_system_disk): Add `st' argument.
Support Linux /dev/mapper/* devices if device-mapper support is
available; only DM-RAID devices are understood at present.
(find_system_device): Add `st' argument. Pass it to
convert_system_partition_to_system_disk.
(grub_util_biosdisk_get_grub_dev): Pass stat result to
find_system_device and convert_system_partition_to_system_disk. Use
find_partition_start.
* conf/common.rmk (grub_mkdevicemap_SOURCES): Add kern/env.c,
kern/err.c, kern/list.c, kern/misc.c, and kern/emu/mm.c.
* util/deviceiter.c [__linux__]: Define MINOR.
(grub_util_iterate_devices): Add support for DM-RAID disk devices.
* util/mkdevicemap.c (grub_putchar): New function.
(grub_getkey): New function.
(grub_refresh): New function.
(main): Set debug=all if -v -v is used.
2010-05-18 12:33:35 +01:00
355b51e9b5
Fix build with non-GNU libcs.
...
* util/misc.c (canonicalize_file_name): Move to ...
* kern/emu/misc.c (canonicalize_file_name): ... here. Needed by
grub_make_system_path_relative_to_its_root.
2010-05-18 11:57:31 +01:00
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
e6127bed25
merge from trunk
2010-05-18 11:14:13 +01:00
1d3293d67d
Remove grub-mkisofs.
...
* conf/common.rmk (bin_UTILITIES): Remove grub-mkisofs.
(grub_mkisofs_SOURCES): Removed.
(grub_mkisofs_CFLAGS): Removed.
* util/mkisofs/defaults.h: Removed.
* util/mkisofs/eltorito.c: Likewise.
* util/mkisofs/exclude.h: Likewise.
* util/mkisofs/hash.c: Likewise.
* util/mkisofs/include/: Likewise.
* util/mkisofs/include/fctldefs.h: Likewise.
* util/mkisofs/include/mconfig.h: Likewise.
* util/mkisofs/include/prototyp.h: Likewise.
* util/mkisofs/include/statdefs.h: Likewise.
* util/mkisofs/iso9660.h: Likewise.
* util/mkisofs/joliet.c: Likewise.
* util/mkisofs/match.c: Likewise.
* util/mkisofs/match.h: Likewise.
* util/mkisofs/mkisofs.c: Likewise.
* util/mkisofs/mkisofs.h: Likewise.
* util/mkisofs/msdos_partition.h: Likewise.
* util/mkisofs/multi.c: Likewise.
* util/mkisofs/name.c: Likewise.
* util/mkisofs/rock.c: Likewise.
* util/mkisofs/tree.c: Likewise.
* util/mkisofs/write.c: Likewise.
2010-05-17 23:33:03 +02:00
8b26d1d30b
add missing sh.mod
2010-05-17 22:23:22 +02:00
7e70395f9c
Cherrypick bugfixes and coreboot+qemu support from expermental
2010-05-17 21:35:39 +02:00
918405fd8c
merge mainline into rescue-efi
2010-05-17 21:26:16 +02:00
ac49c9200a
merge with emu-lite again
2010-05-06 13:13:26 +05:30
1828cb6098
merge with emu-reorg
2010-05-06 13:06:51 +05:30
16321bf9ca
pull-in emu-lite branch
2010-05-06 12:55:47 +05:30
8c41176882
automake commit without merge history
2010-05-06 11:34:04 +05:30
60b4a7c45b
sparc build fix
2010-05-06 10:16:55 +05:30
ab4da2cd36
build fixes for real platforms
2010-05-06 09:33:45 +05:30
da6e6f17f3
cygwin emu build fixes
2010-05-06 08:45:39 +05:30
725396942e
replace --enable-grub-emu-modules with grub-emu-lite
2010-05-04 09:47:48 +05:30
81827e248c
merge with mainline
2010-05-04 09:09:03 +05:30
d1b61374ed
* util/grub-mkconfig_lib.in (make_system_path_relative_to_its_root):
...
Remove broken Cygwin path conversion.
* util/misc.c: [__CYGWIN__] Add include and define.
[__CYGWIN__] (get_win32_path): Copy function from getroot.c, modify
for Cygwin 1.7.
(make_system_path_relative_to_its_root): Simplify loop, replace early
return by break.
[__CYGWIN__] Add conversion to win32 path.
Include "/" case in trailing slash removal.
2010-05-01 21:39:32 +02:00
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
54f83682d4
Add missing escape
2010-04-27 21:43:16 +02:00
f07ccea799
removed some duplicate code
2010-04-27 20:55:12 +05:30
613b1b2c58
Include /grub.cfg
2010-04-27 13:44:39 +02:00
ff6bea78b4
Enable pathspecs
2010-04-27 13:22:38 +02:00
13ac43057b
use uuids on efi
2010-04-27 11:08:53 +02:00
19ba92760a
merge merge-mkimage into rescue-efi
2010-04-27 10:47:29 +02:00
4c7085f82b
added support for --enable-grub-emu-modules build
2010-04-27 13:57:14 +05:30
840b61d8f0
reorganized grub-emu sources to suite upcoming automake build system
2010-04-27 10:50:28 +05:30
88d046d01e
Switch to new grub-mkimage syntax
2010-04-26 21:27:41 +02:00
8ea6ecb36d
Some cleanups
2010-04-26 21:11:16 +02:00
debaf23f7c
all images binary identical to the ones from trunk
2010-04-26 19:11:38 +02:00
BVK Chaitanya