Vladimir 'phcoder' Serbinenko
5779bae94c
merge mainline into newreloc
2010-05-18 14:30:07 +02:00
Colin Watson
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
Vladimir 'phcoder' Serbinenko
13f58ea31f
merge mainline into newreloc
2010-05-18 13:19:42 +02:00
Colin Watson
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
Colin Watson
e6127bed25
merge from trunk
2010-05-18 11:14:13 +01:00
Vladimir 'phcoder' Serbinenko
918405fd8c
merge mainline into rescue-efi
2010-05-17 21:26:16 +02:00
BVK Chaitanya
f1c891902d
merge with mainline
2010-05-06 21:22:08 +05:30
BVK Chaitanya
da6e6f17f3
cygwin emu build fixes
2010-05-06 08:45:39 +05:30
Vladimir 'phcoder' Serbinenko
e96ee4339f
merge mainline into newreloc
2010-05-05 21:41:43 +02:00
Vladimir 'phcoder' Serbinenko
7e720a9bc1
* include/grub/ieee1275/ieee1275.h (grub_ieee1275_flag): New value
...
GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM.
* kern/ieee1275/cmain.c (grub_ieee1275_find_options): Set
GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM on qemu.
* kern/ieee1275/init.c (grub_claim_heap): Don0t allocate below
1.5MiB if GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM is set.
2010-05-05 18:52:13 +02:00
Vladimir 'phcoder' Serbinenko
6a82c1b2db
merge mainline into newreloc
2010-05-04 17:35:44 +02:00
BVK Chaitanya
81827e248c
merge with mainline
2010-05-04 09:09:03 +05:30
Vladimir 'phcoder' Serbinenko
7dd5a111ba
* kern/mm.c (grub_real_malloc): Put magic and size assignment in common
...
part.
2010-05-03 13:12:55 +02:00
Vladimir 'phcoder' Serbinenko
9b058d5291
* kern/mm.c (grub_mm_init_region): Check for region size after aligning
...
pointers.
2010-05-03 13:07:31 +02:00
Vladimir 'phcoder' Serbinenko
2589383147
* kern/mm.c (grub_real_malloc): Fix size calculation when extra == 0.
2010-05-03 12:53:32 +02:00
Vladimir 'phcoder' Serbinenko
4fc5ff74f2
USe more low memory on i386-qemu
2010-05-02 16:27:22 +02:00
Vladimir 'phcoder' Serbinenko
3558c6e93c
* kern/main.c (grub_load_config): Fix copy-pasted comment.
...
Reported by: Seth Goldberg
2010-05-01 21:32:23 +02:00
Vladimir 'phcoder' Serbinenko
d8b5cd4011
* commands/hashsum.c (GRUB_MOD_INIT): Remove duplication of command
...
name and add N_.
* commands/i386/pc/drivemap.c (GRUB_MOD_INIT): Likewise.
* commands/iorw.c (GRUB_MOD_INIT): Likewise.
* commands/password_pbkdf2.c (GRUB_MOD_INIT): Likewise.
* commands/regexp.c (GRUB_MOD_INIT): Likewise.
* commands/setpci.c (GRUB_MOD_INIT): Likewise.
* commands/terminal.c (GRUB_MOD_INIT): Likewise.
* efiemu/main.c (GRUB_MOD_INIT): Likewise.
* font/font_cmd.c (GRUB_MOD_INIT): Likewise.
* kern/corecmd.c (GRUB_MOD_INIT): Likewise.
* mmap/mmap.c (GRUB_MOD_INIT): Likewise.
* normal/context.c (GRUB_MOD_INIT): Likewise.
* normal/main.c (GRUB_MOD_INIT): Likewise.
* term/gfxterm.c (GRUB_MOD_INIT): Likewise.
* term/serial.c (GRUB_MOD_INIT): Likewise.
* term/terminfo.c (GRUB_MOD_INIT): Likewise.
2010-05-01 20:28:07 +02:00
Vladimir 'phcoder' Serbinenko
88c14915f8
* kern/mm.c (grub_real_malloc): Satisfy alignment requirement when
...
extra == 0.
2010-05-01 19:39:32 +02:00
Vladimir 'phcoder' Serbinenko
32fa4348a3
merge mainline into newreloc
2010-05-01 16:38:58 +02:00
Vladimir 'phcoder' Serbinenko
ce60689c68
* kern/i386/coreboot/init.c (grub_machine_init): Call
...
grub_machine_mmap_init on qemu.
2010-05-01 16:35:15 +02:00
Vladimir 'phcoder' Serbinenko
c6fb51295b
merge mainline into newreloc
2010-05-01 15:10:44 +02:00
Vladimir 'phcoder' Serbinenko
7819a4562f
Use LBIO on coreboot.
...
* conf/i386-coreboot.rmk (kernel_img_SOURCES): Change
kern/i386/multiboot_mmap.c to kern/i386/coreboot/mmap.c.
* include/grub/i386/coreboot/memory.h (GRUB_LINUXBIOS_MEMBER_LINK):
New declaration.
* kern/i386/coreboot/init.c (grub_machine_init): Don't call
grub_machine_mmap_init on coreboot.
* kern/i386/coreboot/mmap.c (grub_linuxbios_table_iterate): Handle
GRUB_LINUXBIOS_MEMBER_LINK.
(grub_machine_mmap_iterate): Fix declaration.
* kern/i386/coreboot/startup.S: Don't save mbi location on coreboot.
2010-05-01 14:32:48 +02:00
Vladimir 'phcoder' Serbinenko
3080f7a7bd
* kern/parser.c (grub_parser_execute): Cope with read-only config.
2010-05-01 13:27:13 +02:00
BVK Chaitanya
b84cac2a36
undo some hunks that were removed by mistake
2010-04-27 20:59:45 +05:30
BVK Chaitanya
f07ccea799
removed some duplicate code
2010-04-27 20:55:12 +05:30
Vladimir 'phcoder' Serbinenko
6c3d9c2845
merge boottest into newreloc
2010-04-27 13:34:07 +02:00
Vladimir 'phcoder' Serbinenko
13ac43057b
use uuids on efi
2010-04-27 11:08:53 +02:00
BVK Chaitanya
4c7085f82b
added support for --enable-grub-emu-modules build
2010-04-27 13:57:14 +05:30
BVK Chaitanya
840b61d8f0
reorganized grub-emu sources to suite upcoming automake build system
2010-04-27 10:50:28 +05:30
Vladimir 'phcoder' Serbinenko
8ea6ecb36d
Some cleanups
2010-04-26 21:11:16 +02:00
Vladimir 'phcoder' Serbinenko
debaf23f7c
all images binary identical to the ones from trunk
2010-04-26 19:11:38 +02:00
Vladimir 'phcoder' Serbinenko
bb3208158a
Fill info for remaining platforms. Make efi image identical to image of previous grub-mkimage
2010-04-26 17:19:15 +02:00
Vladimir 'phcoder' Serbinenko
962b15b4c1
Fill info tables for qemu, sparc and mips
2010-04-26 14:42:40 +02:00
Vladimir 'phcoder' Serbinenko
94ac790645
Fix various issues created by previous commits
2010-04-26 10:56:12 +02:00
Vladimir 'phcoder' Serbinenko
2296410ffb
initial support for ppc in grub-mkimage (bugs for now)
2010-04-25 22:26:29 +02:00
Vladimir 'phcoder' Serbinenko
91b58e6b74
EFI requests support for newreloc
2010-04-20 18:08:26 +02:00
Vladimir 'phcoder' Serbinenko
298ffd54b0
merge mainline into newreloc
2010-04-11 22:44:31 +02:00
Vladimir 'phcoder' Serbinenko
4b0cd8f813
Fix cygwin compilation.
...
* configure.ac: Define NEED_REGISTER_FRAME_INFO.
* include/grub/misc.h (__register_frame_info)
[NEED_REGISTER_FRAME_INFO && !UTIL]: New export.
(__deregister_frame_info) [NEED_REGISTER_FRAME_INFO && !UTIL]: Likewise.
* kern/misc.c (__register_frame_info)
[NEED_REGISTER_FRAME_INFO && !UTIL]: New empty function.
(__deregister_frame_info) [NEED_REGISTER_FRAME_INFO && !UTIL]: Likewise.
2010-04-11 21:24:21 +02:00
Vladimir 'phcoder' Serbinenko
2622c3ffb0
* kern/i386/pc/startup.S (grub_getrtsecs): Removed (dead code).
2010-04-05 15:59:32 +02:00
Vladimir 'phcoder' Serbinenko
a8c3b552a7
Remove unused grub_vga_get_font.
...
* kern/i386/pc/startup.S (grub_vga_get_font): Removed.
* include/grub/i386/pc/vga.h (grub_vga_get_font): Likewise.
2010-04-04 14:12:11 +02:00
Grégoire Sutre
187bbe3d9c
* kern/misc.c: Disable the __enable_execute_stack hack for utilities.
...
* include/grub/misc.h: Likewise.
2010-04-03 21:00:21 +02:00
Vladimir 'phcoder' Serbinenko
8b0800f66f
merge mainline into newreloc
2010-04-01 22:17:26 +02:00
Vladimir 'phcoder' Serbinenko
495442ed02
* kern/device.c (grub_device_iterate): Clear errors after failed
...
opening device.
2010-03-31 22:03:48 +02:00
Vladimir 'phcoder' Serbinenko
f9fd65df54
* kern/ieee1275/openfw.c (grub_children_iterate): Skip device itself if
...
returned by firmware.
2010-03-31 22:01:37 +02:00
Vladimir 'phcoder' Serbinenko
969d1c782d
Simplify Apple CC support.
...
* commands/i386/pc/drivemap_int13h.S: Use LOCAL when possible.
Add 0 byte at the end not to have a symbol with empty target.
* mmap/i386/pc/mmap_helper.S: Likewise.
* genmk.rb: Ignore errors 2030 and 2050.
* kern/i386/pc/startup.S: Use LOCAL when possible.
2010-03-27 00:04:14 +01:00
Vladimir 'phcoder' Serbinenko
0790690196
merge mainline into grub-file
2010-03-26 17:06:36 +01:00
Vladimir 'phcoder' Serbinenko
c9ea504d25
merge mainline into nestpart
2010-03-26 15:44:13 +01:00
Adrian Glaubitz
a3940f8874
* kern/dl.c (grub_dl_resolve_symbols): Improve error message
...
grammar.
2010-03-24 12:54:39 +00:00
Vladimir 'phcoder' Serbinenko
f84afb2775
* kern/parser.c: Indented.
2010-03-18 00:19:30 +01:00