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

3197 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Colin Watson
0b45630927 Restore TEXTDOMAINDIR correction from r1889, lost apparently by 
mistake in r2156.  Noticed by Anthony Fok.
* util/grub.d/10_kfreebsd.in (TEXTDOMAINDIR): Set to lowercased
@localedir@.
* util/grub.d/10_linux.in (TEXTDOMAINDIR): Likewise.
 2010-04-14 13:59:58 +01:00
BVK Chaitanya
08f46d6221 Fix a spurious, uninitialized variable warning. 
* loader/i386/bsdXX.c (grub_freebsd_load_elfmodule_obj):
	Initialize variable, shdr.
	(grub_freebsd_load_elfmodule): Likewise.
	(grub_freebsd_load_elf_meta): Likewise.
 2010-04-14 13:48:49 +05:30
BVK Chaitanya
851395d865 fix uninitialized warning 2010-04-14 13:38:05 +05:30
BVK Chaitanya
8c4a72d4b5 Fix for escaped dollar in double quoted strings. 
* script/yylex.l: Updated flex rules.
	* conf/tests.rmk: Rule for new testcase.
	* tests/grub_script_dollar.in: New testcase.
 2010-04-13 21:25:27 +05:30
BVK Chaitanya
ae45b7bad4 add missing testcase 2010-04-13 21:01:56 +05:30
BVK Chaitanya
4e6da157dd fix and testcase for \$ in grub script dquote strings 2010-04-13 20:58:12 +05:30
Carles Pina i Estany
ce44826e79 Enclose all translated strings in grub.cfg in single quotes, and 
escape them appropriately (Ubuntu bug #552921).
* util/grub-mkconfig_lib.in (gettext_quoted): New function.
* util/grub.d/10_hurd.in: Use it.
* util/grub.d/10_kfreebsd.in (kfreebsd_entry): Likewise.
* util/grub.d/10_linux.in (linux_entry): Likewise.
	Also-By: Colin Watson <cjwatson@ubuntu.com>
 2010-04-13 13:57:56 +01: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
01fcf061ea * configure.ac: Respect grub_cv_asm_uscore when defining dummy symbols. 2010-04-11 16:14:51 +02:00
Vladimir 'phcoder' Serbinenko
5d04b11e0e Unify libgcc processing. 
* Makefile.in (kernel_img_LDFLAGS): New variable.
	* conf/common.rmk (kernel_img_HEADERS): Add libgcc.h.
	* conf/i386-coreboot.rmk (kernel_img_LDFLAGS): Append instead of
	overwriting.
	* conf/i386-ieee1275.rmk (kernel_img_LDFLAGS): Likewise.
	* conf/i386-pc.rmk (kernel_img_LDFLAGS): Likewise.
	* conf/i386-qemu.rmk (kernel_img_LDFLAGS): Likewise.
	* conf/x86-efi.rmk (kernel_img_LDFLAGS): Likewise.
	* conf/mips-qemu-mips.rmk (kernel_img_LDFLAGS): Append instead of
	overwriting. Remove -lgcc and -static-libgcc
	* conf/mips-yeeloong.rmk (kernel_img_LDFLAGS): Likewise.
	* conf/mips.rmk (kernel_img_HEADERS): Remove cpu/libgcc.h
	* conf/powerpc-ieee1275.rmk (kernel_img_HEADERS): Remove cpu/libgcc.h
	(kernel_img_LDFLAGS): Append instead of overwriting.
	Remove -lgcc and -static-libgcc
	* conf/sparc64-ieee1275.rmk: Likewise.
	* include/grub/powerpc/libgcc.h: Move to ...
	* include/grub/libgcc.h: .. this.
	* include/grub/libgcc.h: Don't export most of the function on x86.
	(__bswapsi2): New export.
	(__bswapdi2): Likewise.
	* include/grub/mips/libgcc.h: Removed.
	* include/grub/sparc64/libgcc.h: Likewise.
 2010-04-11 01:14:31 +02:00
Vladimir 'phcoder' Serbinenko
b7f3ac299d * util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Remove 
disk_info_msg (conflicts with gettexting into languages with cases).
 2010-04-10 20:28:25 +02:00
Grégoire Sutre
e0fc9e78c1 missing part of patch 2010-04-10 17:09:24 +02:00
Grégoire Sutre
2c7031b135 Add grub-probe support for NetBSD. 
* util/getroot.c (find_root_device): Convert block device to
	character device on NetBSD.
	* util/probe.c (probe): Require character device on NetBSD.
	* util/hostdisk.c: NetBSD specific headers.
	(configure_device_driver): new function to tune device driver
	parameters (currently only for NetBSD floppy driver).
	(grub_util_biosdisk_open): NetBSD specific code (get disk size
	via disklabel ioctl).
	(open_device): call configure_device_driver on NetBSD.
	(convert_system_partition_to_system_disk): NetBSD specific code.
	(device_is_wholedisk): Likewise.
	(grub_util_biosdisk_get_grub_dev): Likewise.
	(make_device_name): Fixed a typo in bsd_part_str.
	* configure.ac: check for opendisk() and getrawpartition() on
	NetBSD and set LIBUTIL.
	* Makefile.in: add LIBUTIL to LIBS.
 2010-04-10 17:07:33 +02:00
BVK Chaitanya
f516290c5a Documentation fix. 
* util/grub-script-check.c: Better help message.
 2010-04-10 19:28:59 +05:30
BVK Chaitanya
84a09b2134 merged with mainline 2010-04-10 19:18:24 +05:30
BVK Chaitanya
d8dcc0dff8 Fix FreeBSD build. 
* configure.ac: Flex version check.
	* conf/common.rmk: Add -Wno-error to sh.mod.
	* script/yylex.l: Remove all #pragma.
 2010-04-10 19:11:32 +05:30
BVK Chaitanya
505a257475 merged with mainline 2010-04-10 18:38:09 +05:30
BVK Chaitanya
20072d3ad5 merged with mainline 2010-04-10 18:09:56 +05:30
BVK Chaitanya
2663fb5f04 flex version check is now done by awk alone 2010-04-10 18:06:45 +05:30
Vladimir 'phcoder' Serbinenko
6734334a53 * include/grub/util/misc.h (canonicalise_file_name): Add missing 
prototype.
	Reported by: Seth Goldberg.
 2010-04-10 12:46:12 +02:00
Vladimir 'phcoder' Serbinenko
daea6abdeb * loader/multiboot.c (GRUB_MOD_INIT) [GRUB_USE_MULTIBOOT2]: 
Rename "module" to "module2".
	Reported by: Seth Goldberg.
 2010-04-10 03:05:03 +02:00
Vladimir 'phcoder' Serbinenko
f2fd9d2b2b * include/grub/efi/memory.h (grub_machine_mmap_iterate): Remove 
EXPORT_FUNC.
	Reported by: Seth Goldberg.
 2010-04-10 02:45:26 +02:00
Vladimir 'phcoder' Serbinenko
be124579b1 * lib/posix_wrap/locale.h: Add missing file. 
Reported by: Seth Goldberg.
 2010-04-10 02:08:01 +02:00
Vladimir 'phcoder' Serbinenko
ef5da797aa grub-emu module load support. 
* Makefile.in (TARGET_NO_MODULES): New variable. All users of
	NO_DYNAMIC_MODULES switched to this.
	(TARGET_CFLAGS): Add -DGRUB_TARGET_NO_MODULES=1 if applicable.
	(CFLAGS): Likewise.
	* conf/any-emu.rmk: Generate symlist.
	(kernel_img_HEADERS): Add util/datetime.h.
	(kernel_img_HEADERS) [sdl]: Add sdl.h.
	(kernel_img_HEADERS) [libusb]: Add libusb.h.
	(kernel_img_SOURCES) [TARGET_NO_MODULES = no && !x86]: Add
	kern/$(target_cpu)/cache.S.
	* configure.ac (grub-emu-modules): New option.
	* genmk.rb: Handle multiple source lists.
	* include/grub/sdl.h: New file.
	* include/grub/libusb.h: Likewise.
	* util/grub-emu.c (main): Hanle (host) root.
	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Error with
	GRUB_ERR_UNKNOWN_DEVICE.
	* util/misc.c: Move mm functions to ...
	* util/mm.c: ... here. All users updated.
 2010-04-10 01:59:00 +02:00
Vladimir 'phcoder' Serbinenko
b3d0fa12af Fix usb support 2010-04-10 01:56:51 +02:00
Vladimir 'phcoder' Serbinenko
a29e902132 Merge mainline into emu-modload 2010-04-10 01:25:46 +02:00
Vladimir 'phcoder' Serbinenko
47822096b5 * Makefile.in (RMKFILES): Search in srcdir and not current directory. 
(MAINTAINER_CLEANFILES): Don't add $(srcdir) to MKFILES. Add few
	missing files.
	(maintainer-clean): Remove libgcrypt-grub.
 2010-04-09 23:04:00 +02:00
Vladimir 'phcoder' Serbinenko
5d7e744525 * term/efi/console.c (grub_console_checkkey): Macroify key contants. 2010-04-09 21:35:52 +02:00
EFI Coder
25f4e25287 * normal/menu_text.c (print_message): Clean up the message and show 
the Fn information when on EFI
	* term/efi/console.c (grub_console_checkkey): Add F4 support.
 2010-04-09 21:16:17 +02:00
Vladimir 'phcoder' Serbinenko
027de555e2 * normal/autofs.c (read_fs_list): New parameter 'prefix'. 
All users updated.
	* normal/crypto.c (read_crypto_list): Likewise.
	* normal/dyncmd.c (read_command_list): Likewise.
	* normal/term.c (read_terminal_list): Likewise.
	* normal/main.c (read_lists): Use explicit prefix.
	(read_lists_hook): Use read_lists.
	(grub_normal_execute): Likewise.
 2010-04-09 21:07:24 +02:00
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
Vladimir 'phcoder' Serbinenko
1118c32ec7 * font/font.c: Indented. 2010-04-09 19:38:23 +02:00
BVK Chaitanya
7d65244782 Elif support to GRUB script (by Deepak Vankadaru). 
* tests/grub_script_if.in: New testcase.
	* conf/tests.rmk: Rule for new testcase.
	* script/parser.y: Grammar rules for elif.
 2010-04-09 22:38:27 +05:30
BVK Chaitanya
68b31b54f5 merged with mainline 2010-04-09 22:32:58 +05:30
BVK Chaitanya
34bb22dfa5 While and until loops support to GRUB script. 
* include/grub/script_sh.h (grub_script_cmdwhile): New struct.
	(grub_script_create_cmdwhile): New function prototype.
	(grub_script_execute_cmdwhile): New function prototype.
	* script/execute.c (grub_script_execute_cmdwhile): New function.
	* script/parser.y (command): New commands.
	(whilecmd): New grammar rule.
	(untilcmd): New grammar rule.
	* script/script.c (grub_script_create_cmdwhile): New function.
	* util/grub-script-check.c (grub_script_execute_cmdwhile): New
	function.

	* tests/grub_script_while1.in: New testcase.
	* conf/tests.rmk: Rule for new testcase.
 2010-04-09 22:04:21 +05:30
BVK Chaitanya
c41c00eab6 merged with mainline 2010-04-09 21:44:59 +05:30
Vladimir 'phcoder' Serbinenko
e215d8e02a * util/grub.d/00_header.in: Add few missing quotes. Recognise *.jpeg 
as *.jpg.
 2010-04-09 17:44:03 +02:00
Mario Vazquez
d7c43ba1c0 GRUB_BACKGROUND support. 
* util/grub-mkconfig.in: Export GRUB_BACKGROUND.
	* util/grub.d/00_header.in: Parse GRUB_BACKGROUND.
 2010-04-09 17:37:38 +02:00
BVK Chaitanya
9705115b22 merged with mainline 2010-04-09 20:53:57 +05:30
Vladimir 'phcoder' Serbinenko
d64795c0eb Load fonts and modules for gfxmenu in grub-mkconfig. 
Idea by: Mario Vasquez

	* util/grub.d/00_header.in: Load pf2 and image modules.
 2010-04-09 16:56:07 +02:00
Vladimir 'phcoder' Serbinenko
f267f83a13 grub-mkconfig multiple terminal support. 
* util/grub-mkconfig.in: Handle multiple terminals correctly.
	* util/grub.d/00_header.in: Likewise.
 2010-04-09 16:29:10 +02:00
Vladimir 'phcoder' Serbinenko
b7841cebaa 2010-04-09 Vladimir Serbinenko <phcoder@gmail.com> 
* Makefile.in: Specify files explicitly instead of using $< and $@ since
	we use cd $(srcdir).
 2010-04-09 16:18:25 +02:00
Colin Watson
df60998c64 * util/grub.d/10_linux.in: Only use the first word of 
GRUB_DISTRIBUTOR for --class, to avoid problems if somebody puts
spaces in GRUB_DISTRIBUTOR.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_hurd.in: Likewise.
 2010-04-08 10:54:44 +01:00
BVK Chaitanya
14e18ae351 Fix unit testing framework for Qemu 0.12. 
* tests/util/grub-shell.in: Remove -serial stdio option.
 2010-04-06 19:13:55 +05:30
BVK Chaitanya
4ee717e12b fix freebsd build 2010-04-06 14:39:11 +05:30
BVK Chaitanya
fa09c82e6e updated changelog 2010-04-06 12:31:44 +05:30
BVK Chaitanya
f9d9068aa7 removed -serial stdio option from qemu cmdline 2010-04-06 12:21:11 +05:30
BVK Chaitanya
6ee26b7469 merged with mainline 2010-04-06 10:07:55 +05:30