Commit graph

1829 commits

Author SHA1 Message Date
robertmh
15355c7d2f 2009-06-21 Robert Millan <rmh.grub@aybabtu.com>
Fix asm file handling on ELF, and remove workarounds.

        * genmk.rb (class Programs): Detect assembly files, and set ASFLAGS
        and -DASM_FILE=1 appropiately (copied from `class Images' stanza).
        * kern/i386/ieee1275/startup.S (ASM_FILE): Remove macro.
        * kern/i386/coreboot/startup.S (ASM_FILE): Likewise.
2009-06-21 17:24:30 +00:00
phcoder
3f3ec72b38 2009-06-21 Vladimir Serbinenko <phcoder@gmail.com>
Load BSD ELF modules

	* conf/i386-pc.rmk (bsd_mod_SOURCES): Add loader/i386/bsd32.c
	and loader/i386/bsd64.c
	* include/grub/i386/bsd.h (FREEBSD_MODTYPE_MODULE): Remove
	(FREEBSD_MODTYPE_ELF_MODULE): New definition
	(FREEBSD_MODTYPE_ELF_MODULE_OBJ): Likewise
	(grub_freebsd_load_elfmodule32): New declaration
	(grub_freebsd_load_elfmoduleobj64): Likewise
	(grub_freebsd_load_elf_meta32): Likewise
	(grub_freebsd_load_elf_meta64): Likewise
	(grub_freebsd_add_meta): Likewise
	(grub_freebsd_add_meta_module): Likewise
	* loader/i386/bsd.c (grub_freebsd_add_meta): Make global
	(grub_freebsd_add_meta_module): Likewise and move module-specific
	parts to grub_cmd_freebsd and grub_cmd_freebsd_module
	(grub_cmd_freebsd): Add elf-kernel specific parts
	based on grub_freebsd_add_meta_module
	(grub_cmd_freebsd_module): Add type parsing moved from
	grub_freebsd_add_meta_module
	(grub_cmd_freebsd_module_elf): New function
	(cmd_freebsd_module_elf): New variable
	(GRUB_MOD_INIT): Register freebsd_module_elf
	* loader/i386/bsd32.c: New file
	* loader/i386/bsd64.c: Likewise
	* loader/i386/bsdXX.c: Likewise
	* kern/elf.c (grub_elf32_load): Let hook decide which pheaders to load
	(grub_elf64_load): Likewise
	* include/grub/elfload.h (grub_elf32_load_hook_t): New parameter do_load
	All users updated
	(grub_elf64_load_hook_t): Likewise
2009-06-21 15:48:10 +00:00
robertmh
0db15301d1 2009-06-21 Colin Watson <cjwatson@ubuntu.com>
* util/grub-mkconfig.in (GRUB_DISABLE_LINUX_RECOVERY): Export
        variable.
        * util/grub.d/10_linux.in: If GRUB_DISABLE_LINUX_RECOVERY is true,
        don't write a menu entry for recovery mode.
2009-06-21 11:21:59 +00:00
robertmh
546796c1d7 2009-06-20 Robert Millan <rmh.grub@aybabtu.com>
* util/i386/pc/grub-mkimage.c (main): Oops, free `output' only
        after it's no longer needed.
2009-06-20 14:32:53 +00:00
robertmh
cd7310d5d5 2009-06-20 Robert Millan <rmh.grub@aybabtu.com>
* include/grub/i386/loader.h (grub_linux_prot_size)
        (grub_linux_tmp_addr, grub_linux_real_addr)
        (grub_linux_is_bzimage, grub_linux16_boot): Declare only on
        GRUB_MACHINE_PCBIOS.
        * util/i386/pc/grub-mkimage.c (compress_kernel): Move
        common grub_util_info() call to ...
        (generate_image): ... here.
        Fix use of uninitialized memory, comparison of signed with
        unsigned integers and memory leak.
        Remove bogus module address message.
2009-06-20 14:11:45 +00:00
phcoder
ab32d3b5fe 2009-06-20 Vladimir Serbinenko <phcoder@gmail.com>
* disk/mdraid_linux.c (GRUB_MOD_FINI): use grub_raid_unregister and not
	grub_raid_register
	* disk/dmraid_nvidia.c (GRUB_MOD_FINI): likewise
2009-06-20 03:06:50 +00:00
proski
024ef597ab 2009-06-19 Pavel Roskin <proski@gnu.org>
* configure.ac: Remove stray AC_MSG_CHECKING.
2009-06-19 21:33:07 +00:00
proski
dd74360c7d Fix a typo, spacing 2009-06-19 20:35:38 +00:00
phcoder
3ac72b5131 2009-06-19 Vladimir Serbinenko <phcoder@gmail.com>
* disk/scsi.c (grub_scsi_open): use continue instead of big if
2009-06-19 17:38:27 +00:00
proski
e14cd81437 2009-06-18 Pavel Roskin <proski@gnu.org>
* conf/common.rmk: Add fs_file.mod.
	* disk/fs_file.c: New file.
	* include/grub/disk.h (enum grub_disk_dev_id): Add
	GRUB_DISK_DEVICE_FILE_ID.
2009-06-18 20:00:34 +00:00
phcoder
26586d9875 2009-06-18 Vladimir Serbinenko <phcoder@gmail.com>
Fix build with Apple's toolchain. Part 2

	* aclocal.m4 (grub_PROG_TARGET_CC): add missing prototype for main and
	a fake start
2009-06-18 14:25:51 +00:00
phcoder
26de2bcdf2 2009-06-18 Vladimir Serbinenko <phcoder@gmail.com>
Fix build with Apple's toolchain. Part 1

	* commands/i386/pc/drivemap_int13h.S: use assembly-time constants
	for long calls
	* configure.ac: remove a leftover AC_MSG_RESULT
	(CFLAGS): don't add -Wl,--defsym,___main=0x8100 when building with 
	Apple's toolchain
2009-06-18 14:02:23 +00:00
phcoder
09b3490b9d 2009-06-18 Vladimir Serbinenko <phcoder@gmail.com>
Fix warnings

	* fs/ntfscomp.c (decomp_get16): initialize c1 and c2
	(decomp_block): initialize ch
	use grub_memcpy instead of memcpy
2009-06-18 13:51:06 +00:00
proski
d363867871 2009-06-17 Pavel Roskin <proski@gnu.org>
* include/grub/i386/coreboot/console.h: Don't use the i386-pc
	version, use declarations needed to use vga_text as the startup
	console.
2009-06-17 19:42:06 +00:00
proski
c22a006a07 2009-06-17 Pavel Roskin <proski@gnu.org>
* conf/i386-coreboot.rmk (kernel_elf_SOURCES): Remove
	term/i386/pc/at_keyboard.c, it doesn't need to be compiled into
	the kernel.
	* kern/i386/coreboot/init.c: Don't call grub_at_keyboard_init()
	and grub_at_keyboard_fini(), it's done on module load and
	unload.
2009-06-17 19:39:36 +00:00
fzielcke
05b129e0d3 2009-06-17 Felix Zielcke <fzielcke@z-51.de>
* loader/i386/linux.c (grub_cmd_linux): Set grub_error if the
	file can't be found.
	* loader/i386/pc/linux.c (grub_cmd_linux): Likewise.
2009-06-17 17:19:23 +00:00
phcoder
cf24ed9e2a 2009-06-17 Vladimir Serbinenko <phcoder@gmail.com>
Fix newline handling

	* include/grub/script_sh.h (grub_lexer_param): new field was_newline
	* script/sh/lexer.c (grub_script_lexer_init): initilaise was_newline
	(grub_script_yylex): don't segfault on unterminated script
	newline terminates command and variable
2009-06-17 13:47:37 +00:00
phcoder
74aa8e4bf8 2009-06-17 Vladimir Serbinenko <phcoder@gmail.com>
avoid double grub_adjust_range call. Bug reported by David Simner

	* kern/disk.c (grub_disk_write): change to raw disk access before
	calling disk_read
2009-06-17 13:15:33 +00:00
fzielcke
1bd265f306 2009-06-17 Colin Watson <cjwatson@ubuntu.com>
* util/elf/grub-mkimage.c (usage): Prefix each option line with two
	spaces, for the benefit of help2man.
	* util/i386/efi/grub-mkimage.c (usage): Likewise.
2009-06-17 06:07:36 +00:00
proski
a2d08c06c3 2009-06-16 Pavel Roskin <proski@gnu.org>
* kern/i386/halt.c: Include grub/machine/init.h.
	* kern/i386/reboot.c: Include grub/cpu/reboot.h.
2009-06-16 20:55:53 +00:00
fzielcke
b97bcb1953 2009-06-16 Felix Zielcke <fzielcke@z-51.de>
* util/grub.d/30_os-prober.in: Use ${root} in the generated
	drivemap menuentry.
2009-06-16 16:59:32 +00:00
fzielcke
0644f96c9f 2009-06-16 James Jarvis <James.Jarvis@ed.ac.uk>
* commands/help.c GRUB_MOD_INIT(echo): Fix the help output of
	`echo' command.
2009-06-16 16:06:49 +00:00
proski
3ef17a2ebf 2009-06-16 Pavel Roskin <proski@gnu.org>
* boot/i386/pc/boot.S: Remove root_drive.  Assert offset of
	boot_drive_check by using GRUB_BOOT_MACHINE_DRIVE_CHECK.  Don't
	save %dx, we only need %dl and we never change it.
	* boot/i386/pc/cdboot.S: Don't set the root drive.
	* boot/i386/pc/pxeboot.S: Likewise.
	* include/grub/i386/pc/boot.h: Remove
	GRUB_BOOT_MACHINE_ROOT_DRIVE, adjust
	GRUB_BOOT_MACHINE_DRIVE_CHECK.
	* include/grub/i386/pc/kernel.h: Remove grub_root_drive.
	* kern/i386/pc/init.c (make_install_device): Remove references
	to grub_root_drive.
	* kern/i386/pc/startup.S: Likewise.
	* util/i386/pc/grub-setup.c (setup): Don't set root_drive.
2009-06-15 23:25:38 +00:00
phcoder
693fe63766 2009-06-16 Vladimir Serbinenko <phcoder@gmail.com>
xnu_uuid command

	* commands/xnu_uuid.c: new file
	* conf/common.rmk (pkglib_MODULES): add xnu_uuid.mod
	(xnu_uuid_mod_SOURCES): new variable
	(xnu_uuid_mod_CFLAGS): likewise
	(xnu_uuid_mod_LDFLAGS): likewise
	* conf/i386-coreboot.rmk (grub_emu_SOURCES): add commands/probe.c
	* conf/i386-ieee1275.rmk: likewise
	* conf/i386-pc.rmk: likewise
	* conf/powerpc-ieee1275.rmk: likewise
	* conf/sparc64-ieee1275.rmk: likewise
	* util/grub.d/30_os-prober.in: use UUID for Mac OS X/Darwin
2009-06-15 22:57:39 +00:00
proski
c9da87d0f3 2009-06-16 Pavel Roskin <proski@gnu.org>
* configure.ac: Avoid '==' in test command, it's not portable.
2009-06-15 22:45:17 +00:00
phcoder
9c6f459688 2009-06-16 Vladimir Serbinenko <phcoder@gmail.com>
Probe command

	* commands/probe.c: new file
	* conf/common.rmk (pkglib_MODULES): add probe.mod
	(probe_mod_SOURCES): new variable
	(probe_mod_CFLAGS): likewise
	(probe_mod_LDFLAGS): likewise
	* conf/i386-coreboot.rmk (grub_emu_SOURCES): add commands/probe.c
	* conf/i386-ieee1275.rmk: likewise
	* conf/i386-pc.rmk: likewise
	* conf/powerpc-ieee1275.rmk: likewise
	* conf/sparc64-ieee1275.rmk: likewise
2009-06-15 22:41:42 +00:00
phcoder
ebc621eac9 Removed bogus >>>> from ChangeLog 2009-06-15 21:09:41 +00:00
phcoder
15a0c03ead 2009-06-15 Vladimir Serbinenko <phcoder@gmail.com>
Fix handling of string like \"hello\" and "a
	b"

	* script/sh/lexer.c
	(grub_script_yylex): fix parsing of quoting, escaping and newline
2009-06-15 21:06:58 +00:00
phcoder
f3880eaf5e 2009-06-15 Vladimir Serbinenko <phcoder@gmail.com>
Fix handling of string like \"hello\" and "a
	b"

	* script/sh/lexer.c (check_textstate): accept GRUB_PARSER_STATE_ESC
	(grub_script_yylex): fix parsing of quoting, escaping and newline
2009-06-15 21:05:50 +00:00
phcoder
3148bc1cbd 2009-06-15 Vladimir Serbinenko <phcoder@gmail.com>
Fix handling of string like \"hello\" and "a
	b"

	* script/sh/lexer.c 
	(grub_script_yylex): fix parsing of quoting, escaping and newline
2009-06-15 21:04:17 +00:00
phcoder
70b7f9fd57 2009-06-15 Vladimir Serbinenko <phcoder@gmail.com>
Fix handling of string like \"hello\" and "a
	b"

	* script/sh/lexer.c (check_textstate): accept GRUB_PARSER_STATE_ESC
2009-06-15 20:59:55 +00:00
phcoder
71c79a6b3b 2009-06-13 Vladimir Serbinenko <phcoder@gmail.com>
* loader/i386/multiboot.c (grub_multiboot_get_bootdev): fix partition 
	handling
2009-06-13 21:09:11 +00:00
fzielcke
880fc3c4f0 2009-06-13 Jun Inoue <jun.lambda@gmail.com>
* util/grub-mkconfig.in: Fix parsing of --output option.
2009-06-13 09:23:54 +00:00
proski
e40893c365 2009-06-12 Pavel Roskin <proski@gnu.org>
* Makefile.in (pkgdata_SRCDIR): Remove.  genmodsrc.sh and
	genmk.rb don't need to be generated or installed.
2009-06-12 20:11:19 +00:00
phcoder
3a1acfe21d 2009-06-12 Vladimir Serbinenko <phcoder@gmail.com>
* commands/i386/pc/drivemap_int13h.S: add more comments
2009-06-12 18:22:38 +00:00
proski
3daba08cfa Fix spacing 2009-06-12 06:12:38 +00:00
proski
0658e928cf 2009-06-11 Pavel Roskin <proski@gnu.org>
* Makefile.in (uninstall): Uninstall manuals.
2009-06-12 02:42:26 +00:00
proski
ca0388f084 2009-06-11 Pavel Roskin <proski@gnu.org>
* Makefile.in: Rename lib_DATA to lib_SCRIPTS, move it from
	PKGLIB to SCRIPTS.  This fixes installation of grub-mkconfig_lib
	and update-grub_lib in two places.
	* conf/common.rmk: Rename lib_DATA to lib_SCRIPTS.
2009-06-12 02:10:21 +00:00
proski
e3b27c39fc 2009-06-11 Pavel Roskin <proski@gnu.org>
* disk/usbms.c (grub_usbms_transfer): Initialize `err' to fix
	a compiler warning.
2009-06-11 22:14:54 +00:00
proski
3a4575d4ea 2009-06-11 Pavel Roskin <proski@gnu.org>
* loader/i386/bsd.c (grub_freebsd_boot): Rename `entry' to
	`entry_lo' to fix variable shadowing.
2009-06-11 21:48:48 +00:00
chrfranke
af1f4f55f8 2009-06-11 Christian Franke <franke@computer.org>
* kern/misc.c (__enable_execute_stack): Add missing return type
	to prevent gcc warning.
2009-06-11 21:39:03 +00:00
fzielcke
5225e649b1 2009-06-11 Felix Zielcke <fzielcke@z-51.de>
* conf/i386-ieee1275.rmk (COMMON_LDFLAGS): Remove `-static -lgcc'.
2009-06-11 21:28:11 +00:00
proski
c1cb63ba4e 2009-06-11 Pavel Roskin <proski@gnu.org>
* Makefile.in: Don't rely on any scripts being executable.
	Always use $(SHELL) to run shell scripts.
2009-06-11 21:00:57 +00:00
proski
7d83bd47b7 2009-06-11 Pavel Roskin <proski@gnu.org>
* configure.ac: Always define ___main if using -nostdlib.  This
	fixes tests on Cygwin.
2009-06-11 20:45:58 +00:00
phcoder
948f48e731 2009-06-11 Giuseppe Caizzone <acaizzo@gmail.com>
UDF fix

	* fs/udf.c (grub_udf_read_block): handle the fact that ad->length 
	is in bytes and not in blocks
2009-06-11 19:32:13 +00:00
proski
8ada9bc12e 2009-06-11 Pavel Roskin <proski@gnu.org>
* kern/i386/halt.c (grub_halt): Make `i' unsigned to fix a
	warning.
2009-06-11 19:11:25 +00:00
fzielcke
25ad23236f 2009-06-11 Felix Zielcke <fzielcke@z-51.de>
* util/grub.d/30_os-prober.in: Fix a comment. Source
	${libdir}/grub/grub-mkconfig_lib.  Use prepare_grub_to_access_device
	to set the root device.  Place drivemap command in the generated
	chain entry.
2009-06-11 19:00:49 +00:00
proski
e65acb0ca8 2009-06-11 Pavel Roskin <proski@gnu.org>
* configure.ac: Remove host_m32.  Issues with 64-bit utilities
	have long been resolved.
2009-06-11 17:31:38 +00:00
proski
bd47b0b5c7 2009-06-11 Colin Watson <cjwatson@ubuntu.com>
* util/grub.d/10_linux.in: Capitalise "Linux".
2009-06-11 17:06:35 +00:00
proski
f285fe2d53 2009-06-11 Colin Watson <cjwatson@ubuntu.com>
* util/grub-pe2elf.c (usage): Fix references to grub-editenv.
2009-06-11 17:02:26 +00:00