]> git.proxmox.com Git - grub2.git/log
grub2.git
14 years ago* kern/emu/misc.c (canonicalize_file_name): realpath can still
Colin Watson [Thu, 27 May 2010 14:45:41 +0000 (15:45 +0100)]
* kern/emu/misc.c (canonicalize_file_name): realpath can still
return NULL for various reasons even if it has a maximum-length
buffer: for example, there might be a symlink loop, or the path
might exceed PATH_MAX.  If this happens, return NULL.

14 years ago2010-05-27 Robert Millan <rmh@gnu.org>
Robert Millan [Thu, 27 May 2010 14:38:16 +0000 (16:38 +0200)]
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!

14 years ago* util/grub-mkrescue.in: Initialise override_dir rather than
Colin Watson [Thu, 27 May 2010 11:43:22 +0000 (12:43 +0100)]
* util/grub-mkrescue.in: Initialise override_dir rather than
assuming that it's unset or empty in the environment.

14 years agoFix -Wshadow warning with emu build on NetBSD.
Grégoire Sutre [Wed, 26 May 2010 21:49:52 +0000 (23:49 +0200)]
Fix -Wshadow warning with emu build on NetBSD.

14 years ago * INSTALL: Added flex >= 2.5.35 requirement.
BVK Chaitanya [Tue, 25 May 2010 12:54:46 +0000 (18:24 +0530)]
* INSTALL: Added flex >= 2.5.35 requirement.

14 years ago * commands/usbtest.c (grub_usb_get_string): Properly support UTF-16.
Vladimir 'phcoder' Serbinenko [Sun, 23 May 2010 12:37:28 +0000 (14:37 +0200)]
* commands/usbtest.c (grub_usb_get_string): Properly support UTF-16.

14 years ago cmostest support.
Vladimir 'phcoder' Serbinenko [Sun, 23 May 2010 12:16:17 +0000 (14:16 +0200)]
cmostest support.

* commands/i386/cmostest.c: New file.
* conf/i386-coreboot.rmk (pkglib_MODULES): Add cmostest.mod.
(cmostest_mod_SOURCES): New variable.
(cmostest_mod_CFLAGS): Likewise.
(cmostest_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk: Likewise.
* docs/grub.texi (Vendor power-on keys): New section.
* util/grub-mkconfig.in: export GRUB_DEFAULT_BUTTON,
GRUB_HIDDEN_TIMEOUT_BUTTON, GRUB_TIMEOUT_BUTTON
and GRUB_BUTTON_CMOS_ADDRESS.
* util/grub.d/00_header.in: Handle powering-on by separate button.

14 years agoAdd default/grub support
Vladimir 'phcoder' Serbinenko [Sun, 23 May 2010 12:11:11 +0000 (14:11 +0200)]
Add default/grub support

14 years ago * gfxmenu/gui_list.c (draw_menu): Don't add scrollbar width to padding.
Vladimir 'phcoder' Serbinenko [Sun, 23 May 2010 11:59:50 +0000 (13:59 +0200)]
* gfxmenu/gui_list.c (draw_menu): Don't add scrollbar width to padding.
Removed drawing_scrollbar argument. All users updated
Fixes #29792.
Reported by Jo Shields

14 years ago * gfxmenu/view.c (grub_gfxmenu_draw_terminal_box): Apply only to current
Vladimir 'phcoder' Serbinenko [Sun, 23 May 2010 11:43:38 +0000 (13:43 +0200)]
* gfxmenu/view.c (grub_gfxmenu_draw_terminal_box): Apply only to current
buffer since gfxterm handles double repaint.

14 years ago * gfxmenu/gfxmenu.c (grub_gfxmenu_try): Change viewport on both buffers.
Vladimir 'phcoder' Serbinenko [Sun, 23 May 2010 11:42:16 +0000 (13:42 +0200)]
* gfxmenu/gfxmenu.c (grub_gfxmenu_try): Change viewport on both buffers.
* term/gfxterm.c (real_scroll): Likewise.

14 years agomerge mainline into cmostest
Vladimir 'phcoder' Serbinenko [Sat, 22 May 2010 18:28:09 +0000 (20:28 +0200)]
merge mainline into cmostest

14 years ago * kern/i386/pc/mmap.c (grub_machine_mmap_iterate): Zero-fill entry
Vladimir 'phcoder' Serbinenko [Fri, 21 May 2010 18:22:29 +0000 (20:22 +0200)]
* kern/i386/pc/mmap.c (grub_machine_mmap_iterate): Zero-fill entry
before calling BIOS.

14 years ago * include/grub/i18n.h: Always enable grub_gettext.
Vladimir 'phcoder' Serbinenko [Fri, 21 May 2010 18:12:41 +0000 (20:12 +0200)]
* include/grub/i18n.h: Always enable grub_gettext.

14 years ago * kern/i386/pc/init.c (make_install_device): Fix a leftover usage of old
Vladimir 'phcoder' Serbinenko [Fri, 21 May 2010 18:08:48 +0000 (20:08 +0200)]
* kern/i386/pc/init.c (make_install_device): Fix a leftover usage of old
partition naming style.

14 years ago* util/grub-mkconfig.in: Fix handling of -o so that it works when
Colin Watson [Fri, 21 May 2010 13:17:15 +0000 (14:17 +0100)]
* util/grub-mkconfig.in: Fix handling of -o so that it works when
not the first option.

14 years ago* util/grub-mkrelpath.c (usage): Remove excess apostrophe.
Colin Watson [Thu, 20 May 2010 22:27:15 +0000 (23:27 +0100)]
* util/grub-mkrelpath.c (usage): Remove excess apostrophe.

14 years ago* util/misc.c: Move inclusion of <limits.h> to ...
Colin Watson [Thu, 20 May 2010 22:16:10 +0000 (23:16 +0100)]
* util/misc.c: Move inclusion of <limits.h> to ...
* kern/emu/misc.c: ... here.  Needed for canonicalize_file_name.

14 years agoFix merge error in NetBSD code.
Grégoire Sutre [Thu, 20 May 2010 00:05:43 +0000 (02:05 +0200)]
Fix merge error in NetBSD code.

14 years ago Fix grub-mkrescue usage unit testing.
BVK Chaitanya [Wed, 19 May 2010 09:01:43 +0000 (14:31 +0530)]
Fix grub-mkrescue usage unit testing.

* tests/util/grub-shell.in: Use --grub-mkimage with grub-mkrescue.

14 years ago * util/grub.d/10_windows.in: Use path names instead of
Christian Franke [Tue, 18 May 2010 19:58:49 +0000 (21:58 +0200)]
* 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.

14 years ago2010-05-18 Justus Winter <4winter@informatik.uni-hamburg.de>
Samuel Thibault [Tue, 18 May 2010 18:10:37 +0000 (20:10 +0200)]
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.

14 years ago * include/grub/i18n.h (gettext): Inline instead of using #define.
Vladimir 'phcoder' Serbinenko [Tue, 18 May 2010 12:00:51 +0000 (14:00 +0200)]
* include/grub/i18n.h (gettext): Inline instead of using #define.
(grub_gettext): Likewise.
(_): Likewise.

14 years ago * Makefile.in (CPPFLAGS): Replace -DGRUB_LIBDIR with
Vladimir 'phcoder' Serbinenko [Tue, 18 May 2010 11:55:26 +0000 (13:55 +0200)]
* 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.

14 years ago * util/grub-install.in: Add missing "in" keyword.
Vladimir 'phcoder' Serbinenko [Tue, 18 May 2010 11:45:25 +0000 (13:45 +0200)]
* util/grub-install.in: Add missing "in" keyword.

14 years ago2010-05-18 Vladimir Serbinenko <phcoder@gmail.com>
Vladimir 'phcoder' Serbinenko [Tue, 18 May 2010 12:21:15 +0000 (14:21 +0200)]
2010-05-18  Vladimir Serbinenko  <phcoder@gmail.com>

* util/grub-mkrescue.in: Remove -O i386-pc duplication.
Reported by: Seth Goldberg.

14 years ago * po/POTFILES: Rename util/grub-mkrawimage.c to util/grub-mkimage.c.
Vladimir 'phcoder' Serbinenko [Tue, 18 May 2010 12:20:00 +0000 (14:20 +0200)]
* po/POTFILES: Rename util/grub-mkrawimage.c to util/grub-mkimage.c.

14 years ago* configure.ac: Check for Linux device-mapper support.
Colin Watson [Tue, 18 May 2010 11:33:35 +0000 (12:33 +0100)]
* 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.

14 years agoFix build with non-GNU libcs.
Colin Watson [Tue, 18 May 2010 10:57:31 +0000 (11:57 +0100)]
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.

14 years ago* util/grub-mkrescue.in: Sync up with grub-install in terms of how
Colin Watson [Tue, 18 May 2010 10:51:37 +0000 (11:51 +0100)]
* 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.

14 years agomerge from trunk
Colin Watson [Tue, 18 May 2010 10:14:13 +0000 (11:14 +0100)]
merge from trunk

14 years ago Remove grub-mkisofs.
Vladimir 'phcoder' Serbinenko [Mon, 17 May 2010 21:33:03 +0000 (23:33 +0200)]
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.

14 years ago Unify grub-mkimage accross platforms.
Vladimir 'phcoder' Serbinenko [Mon, 17 May 2010 21:04:10 +0000 (23:04 +0200)]
Unify grub-mkimage accross platforms.

* Makefile.in (CPPFLAGS): Set GRUB_LIBDIR to $(libdir).
* conf/common.rmk (bin_UTILITIES): Removed grub-mkelfimage.
(grub_mkelfimage_SOURCES): Removed.
(util/elf/grub-mkimage.c_DEPENDENCIES): Renamed to ..
(util/grub-mkimage.c_DEPENDENCIES): .. this.
(bin_UTILITIES): Add grub-mkimage.
(grub_mkimage_SOURCES): New variable.
(kernel_img_HEADERS): Remove machine/kernel.h.
* conf/i386-pc.rmk (pkglib_IMAGES): Remove kernel.img.
(pkglib_PROGRAMS): Add kernel.img.
(kernel_img_HEADERS): Add machine/kernel.h.
(kernel_img_FORMAT): Removed.
(bin_UTILITIES): Remove grub-mkimage.
(grub_mkimage_SOURCES): Removed.
(grub_mkimage_CFLAGS): Likewise.
(util/grub-mkrawimage.c_DEPENDENCIES): Likewise.
* conf/i386-qemu.rmk (pkglib_IMAGES): Remove kernel.img.
(pkglib_PROGRAMS): Add kernel.img.
(bin_UTILITIES): Remove grub-mkimage.
(grub_mkimage_SOURCES): Removed.
(grub_mkimage_CFLAGS): Likewise.
(util/grub-mkrawimage.c_DEPENDENCIES): Likewise.
* conf/mips-qemu-mips.rmk (pkglib_IMAGES): Remove kernel.img.
(pkglib_PROGRAMS): Add kernel.img.
* conf/mips-yeeloong.rmk (pkglib_IMAGES): Remove kernel.img.
(pkglib_PROGRAMS): Add kernel.img.
* conf/mips.rmk (bin_UTILITIES): Remove grub-mkimage.
(grub_mkimage_SOURCES): Removed.
(grub_mkimage_CFLAGS): Likewise.
(util/grub-mkrawimage.c_DEPENDENCIES): Likewise.
* conf/sparc64-ieee1275.rmk (pkglib_IMAGES): Remove kernel.img.
(pkglib_PROGRAMS): Add kernel.img.
(bin_UTILITIES): Remove grub-mkimage.
(grub_mkimage_SOURCES): Removed.
(grub_mkimage_CFLAGS): Likewise.
(util/grub-mkrawimage.c_DEPENDENCIES): Likewise.
* conf/x86-efi.rmk (bin_UTILITIES): Remove grub-mkimage.
(grub_mkimage_SOURCES): Removed.
(grub_mkimage_CFLAGS): Likewise.
(util/grub-mkrawimage.c_DEPENDENCIES): Likewise.
* configure.ac (machine_CFLAGS): Add "-DMACHINE".
* include/grub/efi/pe32.h (grub_pe32_optional_header): Split into ...
(grub_pe32_optional_header): ... this.
(grub_pe64_optional_header): ... and this. All users updated.
(GRUB_PE32_PE32_MAGIC): Split into ..
(GRUB_PE32_PE32_MAGIC): .. this.
(GRUB_PE32_PE64_MAGIC): .. and this.
(GRUB_PE32_SIGNATURE_SIZE): New definition.
* include/grub/elf.h (PT_GNU_STACK): New definition.
* include/grub/i386/coreboot/kernel.h: Merged into include/grub/offsets.h. All users updated.
* include/grub/i386/efi/kernel.h: Likewise.
* include/grub/i386/kernel.h: Likewise.
* include/grub/i386/pc/kernel.h: Likewise.
* include/grub/i386/qemu/boot.h: Likewise.
* include/grub/mips/kernel.h: Likewise.
* include/grub/mips/qemu-mips/kernel.h: Likewise.
* include/grub/powerpc/ieee1275/kernel.h: Likewise.
* include/grub/powerpc/kernel.h: Likewise.
* include/grub/sparc64/ieee1275/boot.h: Likewise.
* include/grub/sparc64/ieee1275/kernel.h: Likewise.
* include/grub/sparc64/kernel.h: Likewise.
* include/grub/x86_64/efi/kernel.h: Likewise.
* include/grub/x86_64/kernel.h: Likewise.
* include/grub/offsets.h: New file.
* include/grub/kernel.h (grub_module_info): Split into ...
(grub_module_info32): ... this.
(grub_module_info64): ... and this.
* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_KERNEL_SEG): Moved from here ...
* include/grub/offsets.h (GRUB_BOOT_I386_PC_KERNEL_SEG): ... here.
(grub_boot_blocklist): Moved from here ...
* include/grub/offsets.h (grub_pc_bios_boot_blocklist): ... here.
* include/grub/i386/pc/memory.h (GRUB_MEMORY_MACHINE_UPPER): Moved from here.
* include/grub/offsets.h (GRUB_MEMORY_I386_PC_UPPER): .. here.
* include/grub/types.h (grub_target_to_host16): Removed.
(grub_target_to_host32): Likewise.
(grub_target_to_host64): Likewise.
(grub_host_to_target16): Likewise.
(grub_host_to_target32): Likewise.
(grub_host_to_target64): Likewise.
(grub_host_to_target_addr): Likewise.

Support grub-mkrescue for efi, coreboot and qemu.

* conf/x86-efi.rmk (bin_SCRIPTS): Add grub-mkrescue.
* kern/efi/init.c (grub_efi_set_prefix): Handle baked in prefix.
* util/elf/grub-mkimage.c: Merged into util/grub-mkimage.c.
* util/grub-mkrawimage.c: Moved from here ...
* util/grub-mkimage.c: ... here. All users updated.
(ALIGN_ADDR): Use image_target.
(TARGET_NO_FIELD): New const.
(image_target_desc): New type.
(image_targets): New array.
(grub_target_to_host64): Use image_target.
(grub_target_to_host32): Likewise.
(grub_target_to_host16): Likewise.
(grub_host_to_target64): Likewise.
(grub_host_to_target32): Likewise.
(grub_host_to_target16): Likewise.
(grub_host_to_target_addr): Likewise.
(generate_image): Handle multiimage.
(main): Require -O parameter. All users updated.
* util/grub-mkimagexx.c: New file. Based on util/grub-mkrawimage.c and
util/efi/grub-mkimage.c
* util/grub-mkrescue.in: Handle coreboot, efi and qemu.
New option --rom-directory.
Use xorriso.
* util/i386/efi/grub-mkimage.c: Removed.
* util/i386/pc/grub-setup.c (grub_target_to_host16): New definition.
(grub_target_to_host32): Likewise.
(grub_target_to_host64): Likewise.
(grub_host_to_target16): Likewise.
(grub_host_to_target32): Likewise.
(grub_host_to_target64): Likewise.
* util/sparc64/ieee1275/grub-setup.c (grub_target_to_host16): New definition.
(grub_target_to_host32): Likewise.
(grub_target_to_host64): Likewise.
(grub_host_to_target16): Likewise.
(grub_host_to_target32): Likewise.
(grub_host_to_target64): Likewise.

14 years agoRevert spurious change in Makefile.in
Vladimir 'phcoder' Serbinenko [Mon, 17 May 2010 20:28:51 +0000 (22:28 +0200)]
Revert spurious change in Makefile.in

14 years agoadd missing sh.mod
Vladimir 'phcoder' Serbinenko [Mon, 17 May 2010 20:23:22 +0000 (22:23 +0200)]
add missing sh.mod

14 years agoCherrypick bugfixes and coreboot+qemu support from expermental
Vladimir 'phcoder' Serbinenko [Mon, 17 May 2010 19:35:39 +0000 (21:35 +0200)]
Cherrypick bugfixes and coreboot+qemu support from expermental

14 years agomerge mainline into rescue-efi
Vladimir 'phcoder' Serbinenko [Mon, 17 May 2010 19:26:16 +0000 (21:26 +0200)]
merge mainline into rescue-efi

14 years agosource tree reorg for emu platform
BVK Chaitanya [Mon, 17 May 2010 15:40:53 +0000 (21:10 +0530)]
source tree reorg for emu platform

14 years agomerge with mainline
BVK Chaitanya [Mon, 17 May 2010 15:06:05 +0000 (20:36 +0530)]
merge with mainline

14 years ago Fix gfxmenu crash.
Vladimir 'phcoder' Serbinenko [Thu, 13 May 2010 01:56:14 +0000 (03:56 +0200)]
Fix gfxmenu crash.
Reported by: Thorsten Grützmacher.

* gfxmenu/gui_circular_progress.c (circprog_destroy): Unregister
timeout hook.
(circprog_set_property): Register and unregister timeout hook.
* gfxmenu/gui_label.c (grub_gui_label): New fields template and value.
(label_destroy): Free template. and unregister hook.
(label_set_state): New function.
(label_set_property): Handle templates and hooks.
* gfxmenu/gui_progress_bar.c (progress_bar_destroy): Unregister
timeout hook.
(progress_bar_set_property): Register and unregister timeout hook.
* gfxmenu/view.c (TIMEOUT_COMPONENT_ID): Move from here ...
* include/grub/gui.h (GRUB_GFXMENU_TIMEOUT_COMPONENT_ID): ...to here
* gfxmenu/view.c (grub_gfxmenu_timeout_notifications): New variable.
(update_timeout_visit): Removed.
(update_timeouts): New function.
(redraw_timeouts): Likewise.
(grub_gfxmenu_print_timeout): Use update_timeouts and redraw_timeouts.
(grub_gfxmenu_clear_timeout): Likewise.
* include/grub/gui.h (grub_gfxmenu_set_state_t): New type.
(grub_gfxmenu_timeout_notify): Likewise.
(grub_gfxmenu_timeout_notifications): New external variable.
(grub_gfxmenu_timeout_register): New function.
(grub_gfxmenu_timeout_unregister): Likewise.

14 years ago Transform (broken) vga terminal into (working) vga video driver.
Vladimir 'phcoder' Serbinenko [Sun, 9 May 2010 09:00:21 +0000 (11:00 +0200)]
Transform (broken) vga terminal into (working) vga video driver.

* conf/i386-pc.rmk (vga_mod_SOURCES): Change term/i386/pc/vga.c to
video/i386/pc/vga.c.
* include/grub/video.h (grub_video_driver_id):
Add GRUB_VIDEO_DRIVER_VGA.
* term/i386/pc/vga.c: Renamed to ...
* video/i386/pc/vga.c: ...this
(DEBUG_VGA): Removed.
(CHAR_WIDTH): Likewise.
(CHAR_HEIGHT): Likewise.
(TEXT_WIDTH): Likewise.
(TEXT_HEIGHT): Likewise.
(DEFAULT_FG_COLOR): Likewise.
(DEFAULT_BG_COLOR): Likewise.
(colored_char): Likewise.
(xpos): Likewise.
(ypos): Likewise.
(cursor_state): Likewise.
(fg_color): Likewise.
(bg_color): Likewise.
(text_buf): Likewise.
(page): Likewise.
(font): Likewise.
(framebuffer): New variable.
(set_read_map): Disabled.
(setup): New variable.
(is_target): Likewise.
(grub_vga_mod_init): Likewise.
(grub_vga_mod_fini): Likewise.
(check_vga_mem): Likewise.
(write_char): Likewise.
(write_cursor): Likewise.
(scroll_up): Likewise.
(grub_vga_putchar): Likewise.
(grub_vga_getcharwidth): Likewise.
(grub_vga_getwh): Likewise.
(grub_vga_getxy): Likewise.
(grub_vga_gotoxy): Likewise.
(grub_vga_cls): Likewise.
(grub_vga_setcolorstate): Likewise.
(grub_vga_setcursor): Likewise.
(grub_video_vga_init): New function.
(grub_video_vga_setup): Likewise.
(grub_video_vga_fini): Likewise.
(update_target): Likewise.
(grub_video_vga_blit_bitmap): Likewise.
(grub_video_vga_blit_render_target): Likewise.
(grub_video_vga_set_active_render_target): Likewise.
(grub_video_vga_get_active_render_target): Likewise.
(grub_video_vga_swap_buffers): Likewise.
(grub_video_vga_set_palette): Likewise.
(grub_video_vga_get_info_and_fini): Likewise.
(grub_vga_term): Removed.
(grub_video_vga_adapter): New variable.
(GRUB_MOD_INIT): Register a video driver instead of terminal.
(GRUB_MOD_FINI): Unrefister a video driver instead of terminal.

14 years agomerge with mainline
BVK Chaitanya [Thu, 6 May 2010 15:52:08 +0000 (21:22 +0530)]
merge with mainline

14 years agosparc build fix
BVK Chaitanya [Thu, 6 May 2010 04:46:55 +0000 (10:16 +0530)]
sparc build fix

14 years agobuild fixes for real platforms
BVK Chaitanya [Thu, 6 May 2010 04:03:45 +0000 (09:33 +0530)]
build fixes for real platforms

14 years agocygwin emu build fixes
BVK Chaitanya [Thu, 6 May 2010 03:15:39 +0000 (08:45 +0530)]
cygwin emu build fixes

14 years ago * video/readers/jpeg.c: Indented.
Vladimir 'phcoder' Serbinenko [Wed, 5 May 2010 19:19:55 +0000 (21:19 +0200)]
* video/readers/jpeg.c: Indented.

14 years ago Various jpeg cleanups.
Vladimir 'phcoder' Serbinenko [Wed, 5 May 2010 19:18:10 +0000 (21:18 +0200)]
Various jpeg cleanups.

* video/readers/jpeg.c (grub_jpeg_get_huff_code): Use ARRAY_SIZE.
(grub_jpeg_decode_quan_table): Use sizeof.
(grub_jpeg_decode_du): Use ARRAY_SIZE.

14 years ago * video/readers/jpeg.c (grub_jpeg_decode_huff_table): Loop over all
Peter Hurley [Wed, 5 May 2010 19:03:59 +0000 (21:03 +0200)]
* video/readers/jpeg.c (grub_jpeg_decode_huff_table): Loop over all
tables. Ignore non-last ac bit.
(grub_jpeg_decode_quan_table): Likewise.

14 years ago * include/grub/ieee1275/ieee1275.h (grub_ieee1275_flag): New value
Vladimir 'phcoder' Serbinenko [Wed, 5 May 2010 16:52:13 +0000 (18:52 +0200)]
* 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.

14 years ago * term/ieee1275/ofconsole.c (grub_ofconsole_getkey): Fix off-by-one
Vladimir 'phcoder' Serbinenko [Wed, 5 May 2010 16:44:02 +0000 (18:44 +0200)]
* term/ieee1275/ofconsole.c (grub_ofconsole_getkey): Fix off-by-one
error.

14 years ago * term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Support C0 code.
Vladimir 'phcoder' Serbinenko [Wed, 5 May 2010 16:42:33 +0000 (18:42 +0200)]
* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Support C0 code.

14 years agomerge with mainline
BVK Chaitanya [Tue, 4 May 2010 03:39:03 +0000 (09:09 +0530)]
merge with mainline

14 years ago * commands/parttool.c (grub_cmd_parttool): Fix #if !GRUB_NO_MODULES
Vladimir 'phcoder' Serbinenko [Mon, 3 May 2010 11:17:12 +0000 (13:17 +0200)]
* commands/parttool.c (grub_cmd_parttool): Fix #if !GRUB_NO_MODULES
condition.

14 years ago * kern/mm.c (grub_real_malloc): Put magic and size assignment in common
Vladimir 'phcoder' Serbinenko [Mon, 3 May 2010 11:12:55 +0000 (13:12 +0200)]
* kern/mm.c (grub_real_malloc): Put magic and size assignment in common
part.

14 years ago * kern/mm.c (grub_mm_init_region): Check for region size after aligning
Vladimir 'phcoder' Serbinenko [Mon, 3 May 2010 11:07:31 +0000 (13:07 +0200)]
* kern/mm.c (grub_mm_init_region): Check for region size after aligning
pointers.

14 years ago * kern/mm.c (grub_real_malloc): Fix size calculation when extra == 0.
Vladimir 'phcoder' Serbinenko [Mon, 3 May 2010 10:53:32 +0000 (12:53 +0200)]
* kern/mm.c (grub_real_malloc): Fix size calculation when extra == 0.

14 years ago * util/grub-mkconfig_lib.in (make_system_path_relative_to_its_root):
Christian Franke [Sat, 1 May 2010 19:39:32 +0000 (21:39 +0200)]
* 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.

14 years ago * kern/main.c (grub_load_config): Fix copy-pasted comment.
Vladimir 'phcoder' Serbinenko [Sat, 1 May 2010 19:32:23 +0000 (21:32 +0200)]
* kern/main.c (grub_load_config): Fix copy-pasted comment.
Reported by: Seth Goldberg

14 years ago * commands/help.c (grub_cmd_help): Fix a typo.
Vladimir 'phcoder' Serbinenko [Sat, 1 May 2010 19:31:45 +0000 (21:31 +0200)]
* commands/help.c (grub_cmd_help): Fix a typo.
Reported by: Seth Goldberg

14 years ago * commands/hashsum.c (GRUB_MOD_INIT): Remove duplication of command
Vladimir 'phcoder' Serbinenko [Sat, 1 May 2010 18:28:07 +0000 (20:28 +0200)]
* 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.

14 years ago * kern/mm.c (grub_real_malloc): Satisfy alignment requirement when
Vladimir 'phcoder' Serbinenko [Sat, 1 May 2010 17:39:32 +0000 (19:39 +0200)]
* kern/mm.c (grub_real_malloc): Satisfy alignment requirement when
        extra == 0.

14 years ago * commands/iorw.c: New file.
Vladimir 'phcoder' Serbinenko [Sat, 1 May 2010 17:37:04 +0000 (19:37 +0200)]
* commands/iorw.c: New file.
* conf/i386.rmk (pkglib_MODULES): Add iorw.mod.
(iorw_mod_SOURCES): New variable.
(iorw_mod_CFLAGS): Likewise.
(iorw_mod_LDFLAGS): Likewise.

14 years ago Hotkey support
Vladimir 'phcoder' Serbinenko [Sat, 1 May 2010 17:33:17 +0000 (19:33 +0200)]
Hotkey support

* include/grub/menu.h (grub_menu_entry): New field 'hotkey'.
* normal/main.c (hotkey_aliases): New variable.
(grub_normal_add_menu_entry): Parse "--hotkey".
* normal/menu_text.c (run_menu): Handle hotkeys.

14 years ago * kern/i386/coreboot/init.c (grub_machine_init): Call
Vladimir 'phcoder' Serbinenko [Sat, 1 May 2010 14:35:15 +0000 (16:35 +0200)]
* kern/i386/coreboot/init.c (grub_machine_init): Call
grub_machine_mmap_init on qemu.

14 years ago * boot/i386/qemu/boot.S: Add a missing .code16.
Vladimir 'phcoder' Serbinenko [Sat, 1 May 2010 12:38:09 +0000 (14:38 +0200)]
* boot/i386/qemu/boot.S: Add a missing .code16.

14 years ago Use LBIO on coreboot.
Vladimir 'phcoder' Serbinenko [Sat, 1 May 2010 12:32:48 +0000 (14:32 +0200)]
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.

14 years ago Split coreboot and multiboot ports.
Vladimir 'phcoder' Serbinenko [Sat, 1 May 2010 12:06:53 +0000 (14:06 +0200)]
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.

14 years ago * kern/parser.c (grub_parser_execute): Cope with read-only config.
Vladimir 'phcoder' Serbinenko [Sat, 1 May 2010 11:27:13 +0000 (13:27 +0200)]
* kern/parser.c (grub_parser_execute): Cope with read-only config.

14 years ago Merge handling of input and output terminals. Fix a hang.
Vladimir 'phcoder' Serbinenko [Sat, 1 May 2010 11:20:07 +0000 (13:20 +0200)]
Merge handling of input and output terminals. Fix a hang.

* commands/terminal.c (abstract_terminal): New struct.
(handle_command): New function. Based on grub_cmd_terminal_input.
(grub_cmd_terminal_input): Use handle_command.
(grub_cmd_terminal_output): Use handle_command.

14 years ago Fix comment handling.
BVK Chaitanya [Sat, 1 May 2010 10:19:43 +0000 (15:49 +0530)]
Fix comment handling.

* tests/grub_script_comments.in: New testcase.
* conf/tests.rmk: Rules for new testcase.
* script/yylex.l: Updated flex rules.

14 years agoadded few more test cases
BVK Chaitanya [Sat, 1 May 2010 10:09:59 +0000 (15:39 +0530)]
added few more test cases

14 years agofix comment and brace handling
BVK Chaitanya [Fri, 30 Apr 2010 08:20:41 +0000 (13:50 +0530)]
fix comment and brace handling

14 years ago* commands/i386/pc/play.c (grub_cmd_play): Call 'grub_file_open' only
Samuel Thibault [Wed, 28 Apr 2010 21:18:16 +0000 (23:18 +0200)]
* commands/i386/pc/play.c (grub_cmd_play): Call 'grub_file_open' only
if argc is 1.

14 years ago* docs/grub.texi (play): Document that zero pitches produce rests.
Samuel Thibault [Wed, 28 Apr 2010 20:59:27 +0000 (22:59 +0200)]
* docs/grub.texi (play): Document that zero pitches produce rests.

14 years ago * conf/x86-efi.rmk (linux_mod_SOURCES): Write explicitly to avoid
Vladimir 'phcoder' Serbinenko [Tue, 27 Apr 2010 20:08:24 +0000 (22:08 +0200)]
* conf/x86-efi.rmk (linux_mod_SOURCES): Write explicitly to avoid
autogen issues.

14 years agoAdd missing escape
Vladimir 'phcoder' Serbinenko [Tue, 27 Apr 2010 19:43:16 +0000 (21:43 +0200)]
Add missing escape

14 years agoundo some hunks that were removed by mistake
BVK Chaitanya [Tue, 27 Apr 2010 15:29:45 +0000 (20:59 +0530)]
undo some hunks that were removed by mistake

14 years agoremoved some duplicate code
BVK Chaitanya [Tue, 27 Apr 2010 15:25:12 +0000 (20:55 +0530)]
removed some duplicate code

14 years agoInclude /grub.cfg
Vladimir 'phcoder' Serbinenko [Tue, 27 Apr 2010 11:44:39 +0000 (13:44 +0200)]
Include /grub.cfg

14 years agoEnable pathspecs
Vladimir 'phcoder' Serbinenko [Tue, 27 Apr 2010 11:22:38 +0000 (13:22 +0200)]
Enable pathspecs

14 years agouse uuids on efi
Vladimir 'phcoder' Serbinenko [Tue, 27 Apr 2010 09:08:53 +0000 (11:08 +0200)]
use uuids on efi

14 years agomerge merge-mkimage into rescue-efi
Vladimir 'phcoder' Serbinenko [Tue, 27 Apr 2010 08:47:29 +0000 (10:47 +0200)]
merge merge-mkimage into rescue-efi

14 years agoadded support for --enable-grub-emu-modules build
BVK Chaitanya [Tue, 27 Apr 2010 08:27:14 +0000 (13:57 +0530)]
added support for --enable-grub-emu-modules build

14 years agoreorganized grub-emu sources to suite upcoming automake build system
BVK Chaitanya [Tue, 27 Apr 2010 05:20:28 +0000 (10:50 +0530)]
reorganized grub-emu sources to suite upcoming automake build system

14 years agoSwitch to new grub-mkimage syntax
Vladimir 'phcoder' Serbinenko [Mon, 26 Apr 2010 19:27:41 +0000 (21:27 +0200)]
Switch to new grub-mkimage syntax

14 years agoSome cleanups
Vladimir 'phcoder' Serbinenko [Mon, 26 Apr 2010 19:11:16 +0000 (21:11 +0200)]
Some cleanups

14 years agoall images binary identical to the ones from trunk
Vladimir 'phcoder' Serbinenko [Mon, 26 Apr 2010 17:11:38 +0000 (19:11 +0200)]
all images binary identical to the ones from trunk

14 years agoFill info for remaining platforms. Make efi image identical to image of previous...
Vladimir 'phcoder' Serbinenko [Mon, 26 Apr 2010 15:19:15 +0000 (17:19 +0200)]
Fill info for remaining platforms. Make efi image identical to image of previous grub-mkimage

14 years agoFill info tables for qemu, sparc and mips
Vladimir 'phcoder' Serbinenko [Mon, 26 Apr 2010 12:42:40 +0000 (14:42 +0200)]
Fill info tables for qemu, sparc and mips

14 years agoUnified grub-mkimage achieved
Vladimir 'phcoder' Serbinenko [Mon, 26 Apr 2010 11:11:43 +0000 (13:11 +0200)]
Unified grub-mkimage achieved

14 years agoFix various issues created by previous commits
Vladimir 'phcoder' Serbinenko [Mon, 26 Apr 2010 08:56:12 +0000 (10:56 +0200)]
Fix various issues created by previous commits

14 years ago * include/grub/util/getroot.h (grub_get_prefix): Remove prototype.
Christian Franke [Mon, 26 Apr 2010 01:35:55 +0000 (03:35 +0200)]
* include/grub/util/getroot.h (grub_get_prefix): Remove prototype.
* util/getroot.c [__CYGWIN__] (get_win32_path): Remove function.
(grub_get_prefix): Remove function.
* util/grub-emu.c (main): Replace grub_get_prefix () call by
make_system_path_relative_to_its_root ().
* util/sparc64/ieee1275/grub-setup.c (main): Likewise.

14 years ago#if-less grub-mkimage
Vladimir 'phcoder' Serbinenko [Sun, 25 Apr 2010 22:45:21 +0000 (00:45 +0200)]
#if-less grub-mkimage

14 years agoRemove grub-mkelfimage
Vladimir 'phcoder' Serbinenko [Sun, 25 Apr 2010 21:04:29 +0000 (23:04 +0200)]
Remove grub-mkelfimage

14 years agoinitial support for ppc in grub-mkimage (bugs for now)
Vladimir 'phcoder' Serbinenko [Sun, 25 Apr 2010 20:26:29 +0000 (22:26 +0200)]
initial support for ppc in grub-mkimage (bugs for now)

14 years agorename grub-mkrawimage to grub-mkimage
Vladimir 'phcoder' Serbinenko [Sun, 25 Apr 2010 17:41:51 +0000 (19:41 +0200)]
rename grub-mkrawimage to grub-mkimage

14 years agoRemove efi/grub-mkimage.c
Vladimir 'phcoder' Serbinenko [Sun, 25 Apr 2010 17:39:22 +0000 (19:39 +0200)]
Remove efi/grub-mkimage.c

14 years agoutil/grub-mkrawimage.c working on EFI
Vladimir 'phcoder' Serbinenko [Sun, 25 Apr 2010 17:38:12 +0000 (19:38 +0200)]
util/grub-mkrawimage.c working on EFI

14 years agomigrate kernel.img to elf
Vladimir 'phcoder' Serbinenko [Sat, 24 Apr 2010 23:54:46 +0000 (01:54 +0200)]
migrate kernel.img to elf

14 years ago * Makefile.in (TARGET_LDFLAGS): Add -static-libgcc.
Christian Franke [Sat, 24 Apr 2010 21:18:57 +0000 (23:18 +0200)]
* Makefile.in (TARGET_LDFLAGS): Add -static-libgcc.
(kernel_img_LDFLAGS): Remove -static-libgcc.