]>
git.proxmox.com Git - grub2.git/log
Robert Millan [Fri, 22 Jan 2010 17:12:40 +0000 (17:12 +0000)]
2010-01-22 Robert Millan <rmh.grub@aybabtu.com>
Use generic grub_reboot() for i386-efi.
* kern/efi/efi.c [__i386__] (grub_reboot): Remove.
* kern/i386/efi/startup.S: Include `"../realmode.S"'.
* kern/i386/realmode.S: Include `<grub/i386/pc/memory.h>'.
Vladimir 'phcoder' Serbinenko [Thu, 21 Jan 2010 23:33:07 +0000 (00:33 +0100)]
2010-01-22 Vladimir Serbinenko <phcoder@gmail.com>
* kern/ieee1275/init.c (grub_machine_set_prefix): Don't check for
presence of "prefix" variable as it breaks when normal.mod is
embedded.
Vladimir 'phcoder' Serbinenko [Thu, 21 Jan 2010 23:07:28 +0000 (00:07 +0100)]
2010-01-21 Vladimir Serbinenko <phcoder@gmail.com>
* term/ieee1275/ofconsole.c (grub_ofconsole_dimensions): Allocate on
stack since heap is unavailable at that point.
Vladimir 'phcoder' Serbinenko [Thu, 21 Jan 2010 16:35:14 +0000 (17:35 +0100)]
2010-01-21 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/i386/bsd.h (FREEBSD_N_BIOS_GEOM): Removed.
(grub_freebsd_bootinfo): Rewritten.
* loader/i386/bsd.c (grub_freebsd_boot): Use new grub_freebsd_bootinfo.
Vladimir 'phcoder' Serbinenko [Thu, 21 Jan 2010 12:58:40 +0000 (13:58 +0100)]
2010-01-21 Vladimir Serbinenko <phcoder@gmail.com>
* util/misc.c (make_system_path_relative_to_its_root): Fix typo.
Robert Millan [Thu, 21 Jan 2010 08:04:49 +0000 (08:04 +0000)]
2010-01-21 Robert Millan <rmh.grub@aybabtu.com>
* po/POTFILES: Remove mkisofs-related files. They have their own TLP
domain now.
Felix Zielcke [Wed, 20 Jan 2010 22:53:53 +0000 (23:53 +0100)]
2010-01-20 Felix Zielcke <fzielcke@z-51.de>
* util/misc.c (make_system_path_relative_to_its_root): Change the work
around for handling "/" to the correct fix. Fix a memory leak. Use
xstrdup instead of strdup.
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 21:21:08 +0000 (22:21 +0100)]
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* conf/mips.rmk (kernel_img_HEADERS): Add env_private.h
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 20:56:05 +0000 (21:56 +0100)]
2009-11-29 Vladimir Serbinenko <phcoder@gmail.com>
Optimise glyph lookup by Basic Multilingual Plane lookup array.
* font/font.c (struct grub_font): New member 'bmp_idx'.
(font_init): Initialise 'bmp_idx'.
(load_font_index): Fill 'bmp_idx'.
(find_glyph): Make inline. Use bmp_idx for BMP characters.
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 20:53:43 +0000 (21:53 +0100)]
merge mainline into bmpidx
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 20:45:41 +0000 (21:45 +0100)]
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* video/fb/video_fb.c (grub_video_fb_scroll): Optimise by avoiding
unnecessary calls.
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 20:38:14 +0000 (21:38 +0100)]
merge mainline into scrollopt
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 20:32:41 +0000 (21:32 +0100)]
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
Move context handling out of the kernel.
* conf/any-emu.rmk (grub_emu_SOURCES): Add normal/context.c.
* conf/common.rmk (normal_mod_SOURCES): Add normal/context.c.
* conf/i386-coreboot.rmk (kernel_img_HEADERS): Add env_private.h.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/i386-pc.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/env.h: Include grub/menu.h.
(grub_env_var_type): Removed.
(grub_env_var): Replaced field 'type' with 'global'.
(grub_env_find): New prototype.
(grub_env_context_open): Remove EXPORT_FUNC.
(grub_env_context_close): Likewise.
(grub_env_export): Likewise.
(grub_env_set_data_slot): Removed.
(grub_env_get_data_slot): Likewise.
(grub_env_unset_data_slot): Likewise.
(grub_env_unset_menu): New prototype.
(grub_env_set_menu): Likewise.
(grub_env_get_menu): Likewise.
* include/grub/env_private.h: New file.
* include/grub/normal.h (grub_context_init): New prototype.
(grub_context_fini): Likewise.
* kern/corecmd.c (grub_core_cmd_export): Moved from here ...
* normal/context.c (grub_cmd_export): ... to here.
* kern/env.c: Include env_private.h.
(HASHSZ): Moved to include/grub/env_private.h.
(grub_env_context): Likewise.
(grub_env_sorted_var): Likewise.
(current_context): Renamed from this ...
(grub_current_context): ...to this. 'static' removed. All users updated.
(grub_env_find): Removed 'static'.
(grub_env_context_open): Moved to normal/context.c.
(grub_env_context_close): Likewise.
(grub_env_export): Likewise.
(mangle_data_slot_name): Removed.
(grub_env_set_data_slot): Likewise.
(grub_env_get_data_slot): Likewise.
(grub_env_unset_data_slot): Likewise.
* kern/main.c (grub_set_root_dev): Don't export root.
It will be done later.
(grub_main): Don't export prefix.
It will be done later.
* normal/context.c: New file.
* normal/main.c (free_menu): Use grub_env_unset_menu.
(grub_normal_add_menu_entry): Use grub_env_get_menu.
(read_config_file): Use grub_env_get_menu and grub_env_set_menu.
(GRUB_MOD_INIT(normal)): Call grub_context_init.
(GRUB_MOD_FINI(normal)): Call grub_context_fini.
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 20:31:39 +0000 (21:31 +0100)]
merge mainline into newenv
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 19:55:55 +0000 (20:55 +0100)]
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
setpci support.
* commands/setpci.c: New file.
* conf/i386.rmk (pkglib_MODULES): Add setpci.mod.
(setpci_mod_SOURCES): New variable.
(setpci_mod_CFLAGS): Likewise.
(setpci_mod_LDFLAGS): Likewise.
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 19:54:58 +0000 (20:54 +0100)]
Use grub_snprintf in commands/setpci.c
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 19:51:00 +0000 (20:51 +0100)]
merge mainline into setpci
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 19:49:18 +0000 (20:49 +0100)]
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* video/sm712.c (grub_video_sm712_setup): Use GRUB_PCI_REG_CLASS.
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 19:42:35 +0000 (20:42 +0100)]
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
Byte-addressable PCI configuration space.
* bus/pci.c (grub_pci_make_address): Use byte address instead of
dword address.
(grub_pci_iterate): Use macroses GRUB_PCI_REG_PCI_ID and
GRUB_PCI_REG_CACHELINE.
* bus/usb/ohci.c (grub_ohci_pci_iter): Use macroses
GRUB_PCI_REG_CLASS and GRUB_PCI_REG_ADDRESS_REG0.
* bus/usb/uhci.c (grub_ohci_pci_iter): Use macroses
GRUB_PCI_REG_CLASS and GRUB_PCI_REG_ADDRESS_REG4.
* commands/efi/fixvideo.c (scan_card): Use macros GRUB_PCI_REG_CLASS.
* commands/efi/loadbios.c (enable_rom_area): Pass byte-address to
grub_pci_make_address.
(lock_rom_area): Likewise.
* commands/lspci.c (grub_lspci_iter): Use macroses
GRUB_PCI_REG_CLASS and GRUB_PCI_REG_ADDRESSES. Handle byte-addressing
of grub_pci_make_address.
* disk/ata.c (grub_ata_pciinit): Likewise.
* include/grub/pci.h (GRUB_PCI_REG_PCI_ID): New macro.
(GRUB_PCI_REG_VENDOR): Likewise.
(GRUB_PCI_REG_DEVICE): Likewise.
(GRUB_PCI_REG_COMMAND): Likewise.
(GRUB_PCI_REG_STATUS): Likewise.
(GRUB_PCI_REG_REVISION): Likewise.
(GRUB_PCI_REG_CLASS): Likewise.
(GRUB_PCI_REG_CACHELINE): Likewise.
(GRUB_PCI_REG_LAT_TIMER): Likewise.
(GRUB_PCI_REG_HEADER_TYPE): Likewise.
(GRUB_PCI_REG_BIST): Likewise.
(GRUB_PCI_REG_ADDRESSES): Likewise.
(GRUB_PCI_REG_ADDRESS_REG): Likewise.
(GRUB_PCI_REG_ADDRESS_REG): Likewise.
(GRUB_PCI_REG_ADDRESS_REG): Likewise.
(GRUB_PCI_REG_ADDRESS_REG): Likewise.
(GRUB_PCI_REG_ADDRESS_REG): Likewise.
(GRUB_PCI_REG_ADDRESS_REG): Likewise.
(GRUB_PCI_REG_CIS_POINTER): Likewise.
(GRUB_PCI_REG_SUBVENDOR): Likewise.
(GRUB_PCI_REG_SUBSYSTEM): Likewise.
(GRUB_PCI_REG_ROM_ADDRESS): Likewise.
(GRUB_PCI_REG_CAP_POINTER): Likewise.
(GRUB_PCI_REG_IRQ_LINE): Likewise.
(GRUB_PCI_REG_IRQ_PIN): Likewise.
(GRUB_PCI_REG_MIN_GNT): Likewise.
(GRUB_PCI_REG_MAX_LAT): Likewise.
* loader/i386/efi/linux.c (find_framebuf): Use GRUB_PCI_REG_CLASS.
* loader/i386/efi/xnu.c (find_framebuf): Likewise.
* video/efi_uga.c (find_framebuf): Likewise.
* util/pci.c (grub_pci_make_address): Use byte-addressed configuration
space.
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 19:40:30 +0000 (20:40 +0100)]
merge mainline into pciclean
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 19:33:01 +0000 (20:33 +0100)]
Add comments to loadbios.c
Robert Millan [Wed, 20 Jan 2010 17:01:12 +0000 (17:01 +0000)]
2010-01-20 Robert Millan <rmh.grub@aybabtu.com>
* util/grub.d/10_linux.in (linux_entry): Set gfxpayload=keep when it
can be reliably determined to be supported.
Robert Millan [Wed, 20 Jan 2010 16:30:20 +0000 (16:30 +0000)]
2010-01-20 Robert Millan <rmh.grub@aybabtu.com>
* loader/i386/linux.c (grub_cmd_linux): If `vga=' was used, write down
that VESA is supported.
(grub_linux_boot): Use generic framebuffer unless VESA is known to be
supported.
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 14:43:21 +0000 (15:43 +0100)]
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* conf/common.rmk (font/font.c_DEPENDENCIES): Condition on FONT_SOURCE.
Robert Millan [Wed, 20 Jan 2010 14:40:00 +0000 (14:40 +0000)]
2010-01-20 Robert Millan <rmh.grub@aybabtu.com>
* util/misc.c (make_system_path_relative_to_its_root): Work around
special-casing of "/", as previous incarnation of this routine did.
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 14:26:31 +0000 (15:26 +0100)]
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
Fix any-emu compilation.
* conf/any-emu.rmk (bin_UTILITIES): Add grub-bin2h.
* grub_bin2h_SOURCES: New variable.
Robert Millan [Wed, 20 Jan 2010 14:10:46 +0000 (14:10 +0000)]
2010-01-20 Robert Millan <rmh.grub@aybabtu.com>
* util/grub.d/00_header.in: Fix stupid mistake from last commit.
Robert Millan [Wed, 20 Jan 2010 13:55:30 +0000 (13:55 +0000)]
2010-01-20 Robert Millan <rmh.grub@aybabtu.com>
* util/grub.d/00_header.in: Fix handling of locale_dir.
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 12:27:23 +0000 (13:27 +0100)]
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* configure.ac: Add /usr/share/fonts/unifont/unifont.pcf.gz
as possible unifont location (Gentoo).
Reported by: Alexander Brüning
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 09:59:15 +0000 (10:59 +0100)]
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
Don't try to generate lists for kernel.img.
* conf/i386-efi.rmk (pkglib_PROGRAMS): New variable.
(pkglib_MODULES): Remove kernel.img.
(kernel_img_EXPORTS): Removed.
(kernel_img_RELOCATABLE): New variable.
* conf/x86_64-efi.rmk: Likewise.
* genmk.rb: Remove *_EXPORTS support and add *_RELOCATABLE support.
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 08:53:23 +0000 (09:53 +0100)]
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/misc.h (grub_sprintf): Removed. All users switched to
grub_xasprintf or grub_snprintf.
(grub_vsprintf): Likewise.
(grub_snprintf): New proto.
(grub_vsnprintf): Likewise.
(grub_xasprintf): Likewise.
(grub_xvasprintf): Likewise.
* kern/misc.c (grub_vprintf): Use grub_vsnprintf_real.
(grub_sprintf): Removed.
(grub_vsnprintf): New function.
(grub_snprintf): Likewise.
(grub_xvasprintf): Likewise.
(grub_xasprintf): Likewise.
(grub_vsprintf): Renamed to ...
(grub_vsnprintf_real): ...this. New argument max_len.
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 08:28:35 +0000 (09:28 +0100)]
ChangeLog
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 08:12:47 +0000 (09:12 +0100)]
Rename asprint into xasprintf and avsprintf into xvasprintf
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 08:02:01 +0000 (09:02 +0100)]
use correct size strings in mips/linux.c
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 08:01:25 +0000 (09:01 +0100)]
add missing error handling
BVK Chaitanya [Wed, 20 Jan 2010 07:22:29 +0000 (12:52 +0530)]
2010-01-20 BVK Chaitanya <bvk.groups@gmail.com>
* include/grub/script_sh.h (sourcecode): Remove const qualifier to
fix grub-script-check warning.
BVK Chaitanya [Wed, 20 Jan 2010 07:18:35 +0000 (12:48 +0530)]
fix grub-script-check warnings
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 07:06:28 +0000 (08:06 +0100)]
merge mainline into asprintf
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 07:04:39 +0000 (08:04 +0100)]
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/font.h (grub_font_load): Fix prototype.
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 07:04:01 +0000 (08:04 +0100)]
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* conf/mips.rmk (kernel_img_HEADERS) [yeeloong]: Add pci.h.
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 07:02:45 +0000 (08:02 +0100)]
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/x86_64/at_keyboard.h: New file.
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 07:01:48 +0000 (08:01 +0100)]
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* loader/mips/linux.c: Include missing grub/i18n.h.
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 06:36:17 +0000 (07:36 +0100)]
merge mainline into asprintf
Robert Millan [Wed, 20 Jan 2010 02:50:36 +0000 (02:50 +0000)]
2009-12-20 Robert Millan <rmh.grub@aybabtu.com>
* normal/menu.c (notify_execution_failure): Clarify error message.
Robert Millan [Wed, 20 Jan 2010 02:43:19 +0000 (02:43 +0000)]
2009-12-20 Robert Millan <rmh.grub@aybabtu.com>
* commands/loadenv.c (check_blocklists): Use `grub_err_t' as
return value (and revert all return statements). Update users.
Colin Watson [Wed, 20 Jan 2010 02:11:07 +0000 (02:11 +0000)]
2010-01-20 Dan Merillat <debian@dan.merillat.org>
* kern/device.c (grub_device_iterate): Allocate new part_ent
structure based on sizeof (*p) rather than sizeof (p->next), to
account for structure padding.
* util/grub-probe.c (probe_raid_level): Return -1 immediately if
disk is NULL, which might happen for LVM physical volumes with no
LVM signature.
Robert Millan [Wed, 20 Jan 2010 01:55:41 +0000 (01:55 +0000)]
Merge mips branch
Robert Millan [Wed, 20 Jan 2010 01:29:06 +0000 (01:29 +0000)]
2009-12-20 Robert Millan <rmh.grub@aybabtu.com>
* loader/mips/linux.c (grub_cmd_initrd)
(GRUB_MOD_INIT(linux)): Adjust and gettextize a few strings.
Robert Millan [Wed, 20 Jan 2010 01:19:53 +0000 (01:19 +0000)]
2009-12-20 Robert Millan <rmh.grub@aybabtu.com>
* kern/mips/yeeloong/init.c (grub_video_sm712_init)
(grub_video_video_init, grub_video_bitmap_init)
(grub_font_manager_init, grub_term_gfxterm_init)
(grub_at_keyboard_init): New extern declarations.
(grub_machine_init): Initialize gfxterm and at_keyboard.
* kern/main.c (grub_main): Revert grub_printf delay kludge.
* util/grub-install.in: Revert embed of `at_keyboard.mod' and
`gfxterm.mod' into core image.
* conf/mips.rmk (pkglib_IMAGES, kernel_img_SOURCES)
(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
(kernel_img_FORMAT): Copy to ...
* conf/mips-qemu-mips.rmk (pkglib_IMAGES, kernel_img_SOURCES)
(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
(kernel_img_FORMAT): ... here, and ...
* conf/mips-yeeloong.rmk (pkglib_IMAGES, kernel_img_SOURCES)
(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
(kernel_img_FORMAT): ... here.
(kernel_img_SOURCES): Add files necessary for output (gfxterm)
and input (at_keyboard) terminals in kernel.
(kernel_img_CFLAGS): Add `-DUSE_ASCII_FAILBACK'.
(pkglib_MODULES): Remove `pci.mod'.
(pci_mod_SOURCES, pci_mod_CFLAGS, pci_mod_LDFLAGS)
(sm712_mod_SOURCES, sm712_mod_CFLAGS, sm712_mod_LDFLAGS)
(at_keyboard_mod_SOURCES, at_keyboard_mod_CFLAGS)
(at_keyboard_mod_LDFLAGS): Remove variables.
Robert Millan [Wed, 20 Jan 2010 00:47:55 +0000 (00:47 +0000)]
Resync
Robert Millan [Wed, 20 Jan 2010 00:42:55 +0000 (00:42 +0000)]
Merge kernel-font branch
Robert Millan [Wed, 20 Jan 2010 00:34:57 +0000 (00:34 +0000)]
Remove a debug comment.
Vladimir 'phcoder' Serbinenko [Wed, 20 Jan 2010 00:08:46 +0000 (01:08 +0100)]
2010-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* include/multiboot.h: Resynced with spec.
* include/multiboot2.h: Likewise.
* loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap): Handle
GRUB_MACHINE_MEMORY_ACPI_RECLAIMABLE and GRUB_MACHINE_MEMORY_NVS.
Robert Millan [Mon, 18 Jan 2010 22:07:05 +0000 (22:07 +0000)]
Add (unused) mode_mask parameter to grub_video_sm712_setup()
Robert Millan [Mon, 18 Jan 2010 20:51:35 +0000 (20:51 +0000)]
Sync with trunk
Robert Millan [Mon, 18 Jan 2010 20:20:34 +0000 (20:20 +0000)]
2010-01-18 Robert Millan <rmh.grub@aybabtu.com>
* include/grub/term.h (grub_term_register_input,
grub_term_register_output): Check return of terminal init()
routines, and abort if errors are raised.
* commands/terminal.c: Update copyright year.
Robert Millan [Mon, 18 Jan 2010 19:45:50 +0000 (19:45 +0000)]
Resync
Robert Millan [Mon, 18 Jan 2010 19:43:39 +0000 (19:43 +0000)]
2010-01-18 Robert Millan <rmh.grub@aybabtu.com>
* include/grub/term.h (grub_term_register_input,
grub_term_register_output): Check return of terminal init()
routines, and abort if errors are raised.
* commands/terminal.c: Update copyright year.
Robert Millan [Mon, 18 Jan 2010 19:34:26 +0000 (19:34 +0000)]
Resync with trunk
Robert Millan [Mon, 18 Jan 2010 19:31:10 +0000 (19:31 +0000)]
2010-01-18 Robert Millan <rmh.grub@aybabtu.com>
* commands/terminal.c (grub_cmd_terminal_input)
(grub_cmd_terminal_output): Check return of terminal init()
routines, and abort if errors are raised.
Vladimir 'phcoder' Serbinenko [Mon, 18 Jan 2010 18:25:20 +0000 (19:25 +0100)]
2010-01-18 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/i386/bsd.h: Fix include pathes.
Vladimir 'phcoder' Serbinenko [Mon, 18 Jan 2010 16:40:23 +0000 (17:40 +0100)]
2010-01-18 Vladimir Serbinenko <phcoder@gmail.com>
Add missing *BSD copyright headers.
* include/grub/aout.h: Add BSD licence.
* include/grub/i386/bsd.h: Parts under different licences moved to ...
* include/grub/i386/freebsd_linker.h: ... here,
* include/grub/i386/freebsd_reboot.h: ... here,
* include/grub/i386/netbsd_bootinfo.h: ... here,
* include/grub/i386/netbsd_reboot.h: ... here,
* include/grub/i386/openbsd_bootarg.h: ... here,
* include/grub/i386/openbsd_reboot.h: ... and here. Added appropriate
licence to each file.
Robert Millan [Mon, 18 Jan 2010 16:22:03 +0000 (16:22 +0000)]
2010-01-18 Robert Millan <rmh.grub@aybabtu.com>
* acinclude.m4: Remove `nop' assembly instruction; it's not
implemented by all architectures.
Robert Millan [Mon, 18 Jan 2010 16:08:25 +0000 (16:08 +0000)]
2010-01-18 Robert Millan <rmh.grub@aybabtu.com>
* loader/i386/efi/linux.c (grub_cmd_linux): Stop pretending we're
ELILO. This is no longer necessary.
BVK Chaitanya [Mon, 18 Jan 2010 14:19:19 +0000 (19:49 +0530)]
Add missing ChangeLog entry for -r2078
Robert Millan [Mon, 18 Jan 2010 13:45:40 +0000 (13:45 +0000)]
2010-01-18 Robert Millan <rmh.grub@aybabtu.com>
Fix annoying UI bug in rescue mode. Thanks to Tristan Gingold for
spotting it back in 2008. Shame on me for forgetting he did.
* kern/rescue_reader.c (grub_rescue_run): Skip zero-length lines.
BVK Chaitanya [Mon, 18 Jan 2010 12:29:18 +0000 (17:59 +0530)]
2010-01-18 BVK Chaitanya <bvk.groups@gmail.com>
Added new tool, grub-scrit-check to verify grub.cfg syntax.
* util/grub-script-check.c: grub-script-check tool.
* conf/common.rmk: Make rules for grub-script-check.
BVK Chaitanya [Mon, 18 Jan 2010 11:28:31 +0000 (16:58 +0530)]
update copyright year
BVK Chaitanya [Mon, 18 Jan 2010 11:28:03 +0000 (16:58 +0530)]
merge trunk
Robert Millan [Mon, 18 Jan 2010 07:49:50 +0000 (07:49 +0000)]
2010-01-18 Robert Millan <rmh.grub@aybabtu.com>
* include/grub/i386/linux.h (GRUB_VIDEO_TYPE_TEXT): Rename to ...
(GRUB_VIDEO_LINUX_TYPE_TEXT): ... this. Update all users.
(GRUB_VIDEO_TYPE_VLFB): Rename to ...
(GRUB_VIDEO_LINUX_TYPE_VESA): ... this. Update all users.
(GRUB_VIDEO_TYPE_EFI): Rename to ...
(GRUB_VIDEO_LINUX_TYPE_SIMPLE): ... this. Update all users.
Robert Millan [Sun, 17 Jan 2010 17:29:57 +0000 (17:29 +0000)]
2010-01-17 Robert Millan <rmh.grub@aybabtu.com>
* include/grub/test.h: Add license header.
* tests/example_functional_test.c: Likewise.
* tests/example_unit_test.c: Likewise.
* tests/lib/functional_test.c: Likewise.
* tests/lib/test.c: Likewise.
* tests/lib/unit_test.c: Likewise.
Vladimir 'phcoder' Serbinenko [Sun, 17 Jan 2010 16:52:01 +0000 (17:52 +0100)]
2010-01-17 Vladimir Serbinenko <phcoder@gmail.com>
Use flag-based instead of hook-based video mode selection and "auto"
keyword.
* include/grub/video.h (grub_video_adapter): Changed 'setup' member.
(grub_video_set_mode): Changed prototype. All users updated.
(grub_video_check_mode_flag): New inline function.
* video/video.c (parse_modespec): New function.
(grub_video_set_mode): Parse flags and keywords.
carles [Sun, 17 Jan 2010 14:42:19 +0000 (14:42 +0000)]
2010-01-17 Carles Pina i Estany <carles@pina.cat>
* util/misc.c (grub_util_info): Fix the order of the parameters in a
fprintf call.
Felix Zielcke [Sat, 16 Jan 2010 10:57:47 +0000 (11:57 +0100)]
2010-01-16 Grégoire Sutre <gregoire.sutre@gmail.com>
* genmk.rb (class SCRIPT): Replace option -i of sed by a pipe.
carles [Sat, 16 Jan 2010 00:39:14 +0000 (00:39 +0000)]
2010-01-16 Carles Pina i Estany <carles@pina.cat>
* util/grub-editenv.c (usage): Use `program_name' instead of hardcoded
string.
* util/grub-emu.c (usage): Likewise.
* util/grub-mkpasswd-pbkdf2.c (usage): Likewise.
* util/i386/efi/grub-mkimage.c (usage): Likewise.
* util/i386/pc/grub-mkimage.c (usage): Likewise.
* util/i386/pc/grub-setup.c (usage): Likewise.
carles [Sat, 16 Jan 2010 00:26:52 +0000 (00:26 +0000)]
2010-01-16 Carles Pina i Estany <carles@pina.cat>
* util/misc.c (grub_util_warn): Gettextizze, print full stop after
the message.
(grub_util_info): Likewise.
(grub_util_error): Likewise.
* util/elf/grub-mkimage.c: Fix capitalisation, quotes, full stops
and/or new lines in `grub_util_warna', `grub_util_info',
`grub_util_error' calls.
* util/getroot.c: Likewise.
* util/grub-editenv.c: Likewise.
* util/grub-emu.c: Likewise.
* util/grub-fstest.c: Likewise.
* util/grub-mkdevicemap.c: Likewise.
* util/grub-mkfont.c: Likewise.
* util/grub-mkpasswd-pbkdf2.c: Likewise.
* util/grub-mkrelpath.c: Likewise.
* util/grub-pe2elf.c: Likewise.
* util/grub-probe.c: Likewise.
* util/hostdisk.c: Likewise.
* util/i386/efi/grub-mkimage.c: Likewise.
* util/i386/pc/grub-mkimage.c: Likewise.
* util/i386/pc/grub-setup.c: Likewise.
* util/ieee1275/ofpath.c: Likewise.
* util/mkisofs/eltorito.c: Likewise.
* util/mkisofs/rock.c: Likewise.
* util/mkisofs/write.c: Likewise.
* util/raid.c: Likewise.
* util/sparc64/ieee1275/grub-mkimage.c: Likewise.
* util/sparc64/ieee1275/grub-setup.c: Likewise.
Vladimir 'phcoder' Serbinenko [Fri, 15 Jan 2010 20:11:51 +0000 (21:11 +0100)]
2010-01-15 Vladimir Serbinenko <phcoder@gmail.com>
Enable multiboot on non-pc.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (pkglib_MODULES): Move
multiboot.mod and multiboot2.mod to ...
* conf/i386.rmk (pkglib_MODULES): ... here.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_SOURCES):
Moved to ...
* conf/i386.rmk (multiboot_mod_SOURCES): .. here.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_CFLAGS):
Moved to ...
* conf/i386.rmk (multiboot_mod_CFLAGS): .. here.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_ASFLAGS):
Moved to ...
* conf/i386.rmk (multiboot_mod_ASFLAGS): .. here.
* conf/i386-coreboot.rmk, conf/i386-pc.rmk (multiboot_mod_LDFLAGS):
Moved to ...
* conf/i386.rmk (multiboot_mod_LDFLAGS): .. here.
* conf/x86_64-efi.rmk (pkglib_MODULES): Remove ata.mod and
relocator.mod.
(ata_mod_SOURCES): Removed.
(ata_mod_CFLAGS): Likewise.
(ata_mod_LDFLAGS): Likewise.
(relocator_mod_SOURCES): Removed.
(relocator_mod_CFLAGS): Likewise.
(relocator_mod_ASFLAGS): Likewise.
(relocator_mod_LDFLAGS): Likewise.
Include i386.mk.
* include/grub/x86_64/multiboot.h: New file.
* loader/i386/multiboot.c (grub_multiboot_boot) [GRUB_MACHINE_EFI]:
Terminate EFI.
Vladimir 'phcoder' Serbinenko [Fri, 15 Jan 2010 15:30:57 +0000 (16:30 +0100)]
2010-01-15 Vladimir Serbinenko <phcoder@gmail.com>
Video multiboot support.
* include/grub/multiboot.h (grub_multiboot_set_accepts_video):
New prototype.
* include/multiboot.h: Resynced with multiboot specification.
* include/multiboot2.h: Likewise.
* loader/i386/multiboot.c (UNSUPPORTED_FLAGS): Support video flags.
(grub_multiboot): Parse MULTIBOOT_VIDEO_MODE fields.
* loader/i386/multiboot_mbi.c (DEFAULT_VIDEO_MODE): New constant.
(HAS_VGA_TEXT): Likewise.
(accepts_video): New variable.
(grub_multiboot_set_accepts_video): New function.
(grub_multiboot_get_mbi_size): Account for video structures.
(set_video_mode): New function.
(retrieve_video_parameters): Likewise.
(grub_multiboot_make_mbi): Fill video fields.
Vladimir 'phcoder' Serbinenko [Fri, 15 Jan 2010 15:11:18 +0000 (16:11 +0100)]
2010-01-15 Vladimir Serbinenko <phcoder@gmail.com>
Video driver ids.
* include/grub/video.h (grub_video_driver_id): New type.
(grub_video_adapter): New member 'id'. All users updated.
(grub_video_get_driver_id): New proto.
* video/video.c (grub_video_get_driver_id): New function.
carles [Thu, 14 Jan 2010 23:20:13 +0000 (23:20 +0000)]
2010-01-14 Carles Pina i Estany <carles@pina.cat>
* util/grub.d/30_os-prober.in: Use `set var=val' rather than plain
`var=val'.
carles [Thu, 14 Jan 2010 23:07:44 +0000 (23:07 +0000)]
2010-01-14 Carles Pina i Estany <carles@pina.cat>
* normal/cmdline.c (print_completion): Gettextizze.
carles [Thu, 14 Jan 2010 23:04:49 +0000 (23:04 +0000)]
2001-01-14 Carles Pina i Estany <carles@pina.cat>
* loader/i386/pc/chainloader.c: Include `<grub/mm.h>'.
carles [Thu, 14 Jan 2010 22:31:06 +0000 (22:31 +0000)]
2010-01-14 Carles Pina i Estany <carles@pina.cat>
* gettext/gettext.c (grub_gettext_translate): Push and pop
grub_errno.
(grub_gettext_delete_list): Change comment style.
* kern/err.c (grub_error): Gettextizze.
(grub_fatal): Gettextizze.
Robert Millan [Thu, 14 Jan 2010 21:17:05 +0000 (22:17 +0100)]
Fix $srcdir != $builddir build by moving ascii.h to top dir.
Robert Millan [Thu, 14 Jan 2010 21:08:31 +0000 (21:08 +0000)]
2010-01-14 Robert Millan <rmh.grub@aybabtu.com>
* include/grub/i386/loader.h (grub_linux16_boot): Renamed to ...
(grub_linux16_real_boot): ... this.
* kern/i386/loader.S: Likewise.
* loader/i386/pc/linux.c: Include `<grub/video.h>' and `<grub/mm.h>'.
(grub_linux16_boot): New function. Switches to text mode and calls
grub_linux16_real_boot().
* loader/i386/bsd.c: Include `<grub/video.h>'.
(grub_freebsd_boot, grub_openbsd_boot, grub_netbsd_boot): Switch to
text mode before calling grub_unix_real_boot().
* loader/i386/multiboot.c: Include `<grub/video.h>'.
(grub_multiboot_boot): Switch to text mode before calling
grub_relocator32_boot().
* loader/i386/pc/chainloader.c: Include `<grub/video.h>'.
(grub_chainloader_boot): Switch to text mode before calling
grub_chainloader_real_boot().
Robert Millan [Thu, 14 Jan 2010 20:33:10 +0000 (20:33 +0000)]
Support --help and --version in grub-bin2h.
Robert Millan [Thu, 14 Jan 2010 18:52:39 +0000 (18:52 +0000)]
2010-01-05 Jordan Uggla <jordan.uggla@gmail.com>
2010-01-05 Colin Watson <cjwatson@ubuntu.com>
* util/grub-reboot.in: Make sure prev_saved_entry always gets a
non-empty value.
Colin Watson [Thu, 14 Jan 2010 14:06:36 +0000 (14:06 +0000)]
fix changelog dates
Colin Watson [Thu, 14 Jan 2010 14:04:44 +0000 (14:04 +0000)]
merge from trunk
BVK Chaitanya [Thu, 14 Jan 2010 13:45:21 +0000 (19:15 +0530)]
2010-01-14 BVK Chaitanya <bvk.groups@gmail.com>
Unit testing framework for GRUB.
* Makefile.in: Test framework build rules for 'make check'.
* conf/tests.rmk: Build rules for individual tests and framework.
* include/grub/test.h: Header file for whitebox tests.
* tests/lib/functional_test.c: Framework support for whitebox
functional tests.
* tests/lib/test.c: Common whitebox testing code for unit and
functional tests.
* tests/lib/unit_test.c: Framework support for whitebox unit
tests.
* tests/util/grub-shell-tester.in: Support utility for grub-script
tests.
* tests/util/grub-shell.in: Utility to execute grub-script
commands in a Qemu instance.
* tests/example_functional_test.c: Example whitebox functional
test.
* tests/example_grub_script_test.in: Example grub-script test.
* tests/example_scripted_test.in: Example scripted test.
* tests/example_unit_test.c: Example whitebox unit test.
BVK Chaitanya [Thu, 14 Jan 2010 13:15:19 +0000 (18:45 +0530)]
merge trunk
BVK Chaitanya [Thu, 14 Jan 2010 13:09:12 +0000 (18:39 +0530)]
use qemu-system-i386 instead of qemu
BVK Chaitanya [Thu, 14 Jan 2010 11:47:51 +0000 (17:17 +0530)]
removed unnecessary grub_test_* wrappers
Vladimir 'phcoder' Serbinenko [Thu, 14 Jan 2010 11:40:55 +0000 (12:40 +0100)]
2010-01-14 Vladimir Serbinenko <phcoder@gmail.com>
* conf/i386-coreboot.rmk (multiboot_mod_SOURCES):
Add loader/i386/multiboot_mbi.c.
(multiboot2_mod_SOURCES): Likewise.
* conf/i386-pc.rmk (multiboot_mod_SOURCES): Likewise.
(multiboot2_mod_SOURCES): Likewise.
* include/grub/multiboot.h (grub_multiboot_get_mbi_size): New proto.
(grub_multiboot_make_mbi): Likewise.
(grub_multiboot_free_mbi): Likewise.
(grub_multiboot_init_mbi): Likewise.
(grub_multiboot_add_module): Likewise.
(grub_multiboot_set_bootdev): Likewise.
* loader/i386/multiboot.c (mbi): Removed.
(mbi_dest): Likewise.
(alloc_mbi): New variable.
(grub_multiboot_payload_size): Removed. All users updated.
(grub_multiboot_pure_size): New variable.
(grub_multiboot_boot): Use grub_multiboot_make_mbi.
(grub_multiboot_unload): Use grub_multiboot_free_mbi.
(grub_get_multiboot_mmap_len): Moved to loader/i386/multiboot_mbi.c.
(grub_fill_multiboot_mmap): Likewise.
(grub_multiboot_get_bootdev): Likewise.
(grub_multiboot): Use multiboot_mbi functions.
* loader/i386/multiboot_mbi.c: New file.
Vladimir 'phcoder' Serbinenko [Thu, 14 Jan 2010 11:34:23 +0000 (12:34 +0100)]
Merge mainline into abstractmbi
Vladimir 'phcoder' Serbinenko [Wed, 13 Jan 2010 21:53:12 +0000 (22:53 +0100)]
2010-01-13 Vladimir Serbinenko <phcoder@gmail.com>
* kern/efi/init.c (grub_efi_fini): Don't call grub_efi_mm_fini as
it would result in module crash.
Vladimir 'phcoder' Serbinenko [Wed, 13 Jan 2010 19:43:48 +0000 (20:43 +0100)]
2010-01-13 Vladimir Serbinenko <phcoder@gmail.com>
* term/ieee1275/ofconsole.c (grub_ofconsole_putchar): Handle '\r'.
(grub_ofconsole_getwh): Split to ...
(grub_ofconsole_getwh): ... this.
(grub_ofconsole_dimensions): ...and this.
(grub_ofconsole_init_output): Call grub_ofconsole_dimensions.
Robert Millan [Wed, 13 Jan 2010 19:10:57 +0000 (19:10 +0000)]
2010-01-13 Robert Millan <rmh.grub@aybabtu.com>
* util/mkisofs/rock.c (generate_rock_ridge_attributes): Fix a typo.
carles [Tue, 12 Jan 2010 20:37:45 +0000 (20:37 +0000)]
2010-01-12 Carles Pina i Estany <carles@pina.cat>
* Makefile.in (DUSE_ASCII_FAILBACK): New macro.
Vladimir 'phcoder' Serbinenko [Tue, 12 Jan 2010 18:47:02 +0000 (19:47 +0100)]
Small cleanup