Felix Zielcke
990f35486e
2009-12-22 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkrescue.in (pkglib_DATA): Set to @pkglib_DATA@.
* genmk.rb (class SCRIPT): Modify the target file instead of source.
2009-12-22 18:20:27 +01:00
Vladimir 'phcoder' Serbinenko
d3d30ea08e
2009-12-22 Vladimir Serbinenko <phcoder@gmail.com>
...
* commands/memrw.c (grub_cmd_write): Support for mask parameter.
(GRUB_MOD_INIT(memrw)): Update help line.
2009-12-22 17:00:28 +01:00
Vladimir 'phcoder' Serbinenko
a34f5c705a
2009-12-22 Vladimir Serbinenko <phcoder@gmail.com>
...
* commands/memrw.c (cmd_read_byte, cmd_read_word, cmd_read_dword):
Use grub_extcmd_t. All users updated.
(options): New variable.
(grub_cmd_read): Restructure for readability. Support "-v" option.
(grub_cmd_write): Restructure for readability.
2009-12-22 16:36:50 +01:00
Felix Zielcke
67618ea6a0
2009-12-22 Felix Zielcke <fzielcke@z-51.de>
...
* genmk.rb (class SCRIPT): Prepend #{src} path with $(srcdir).
2009-12-22 12:41:31 +01:00
Felix Zielcke
10a8879783
2009-12-22 Felix Zielcke <fzielcke@z-51.de>
...
* genmk.rb (class SCRIPT): Use sed to substitute @pkglib_DATA@
with the actual contents of the correspondending make variable.
* util/grub-mkrescue.in (pkglib_DATA): New variable.
(process_input_dir): Copy all $pkglib_DATA files instead of explicitly
specifying `*.lst' and `efiemu??.o'
2009-12-22 12:12:51 +01:00
Felix Zielcke
7e70dfffc1
2009-12-22 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub.d/30_os-prober.in (osx_entry): Add round brackets
after function name.
Noticed by Rene Engelhard <rene@debian.org>.
2009-12-22 12:02:57 +01:00
Vladimir 'phcoder' Serbinenko
dc77a79959
2009-12-22 Vladimir Serbinenko <phcoder@gmail.com>
...
* commands/lspci.c (grub_pci_classes): Add "USB Controller".
(options): New variable.
(iospace): Likewise.
(grub_lspci_iter): List IO spaces if "-i" was given.
(grub_cmd_lspci): Parse options.
(GRUB_MOD_INIT(lspci)): Use extcmd.
(GRUB_MOD_FINI(lspci)): Likewise.
2009-12-22 10:41:53 +01:00
Felix Zielcke
82000aa2b2
2009-12-22 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub.d/30_os-prober.in (osx_entry): Remove non POSIX compliant
`function' keyword.
Patch by Tony Mancill <tmancill@debian.org>.
2009-12-22 10:35:04 +01:00
Vladimir 'phcoder' Serbinenko
11d1828177
2009-12-22 Vladimir Serbinenko <phcoder@gmail.com>
...
* bus/usb/usbhub.c (grub_usb_hub_add_dev): Fix loop-break condition.
2009-12-22 10:18:18 +01:00
Vladimir 'phcoder' Serbinenko
b5d5993b6d
2009-12-22 Vladimir Serbinenko <phcoder@gmail.com>
...
* bus/usb/uhci.c (grub_uhci_transfer): Set a limit transaction time.
(grub_uhci_portstatus): Likewise.
(grub_uhci_portstatus): Add necessary delay.
2009-12-22 10:15:59 +01:00
carles
98a50553b2
Fix ommission from ChangeLog.
2009-12-21 23:28:28 +00:00
carles
e9bbb4e721
Adds a missting entry in the ChangeLog.
2009-12-21 22:41:28 +00:00
carles
cb04503e0f
Specify better previous ChangeLog.
2009-12-21 22:09:18 +00:00
carles
941903f2bd
2009-12-21 Carles Pina i Estany <carles@pina.cat>
...
* commands/acpi.c (options): Fix capitalizations and/or full stops.
(GRUB_MOD_INIT): Likewise.
* commands/boot.c (GRUB_MOD_INIT): Likewise.
* commands/cmp.c (grub_cmd_cmp): Likewise.
* commands/echo.c (options): Likewise.
* commands/efi/loadbios.c (enable_rom_area): Likewise.
(enable_rom_area): Likewise.
(GRUB_MOD_INIT): Likewise.
* commands/gptsync.c (GRUB_MOD_INIT): Likewise.
* commands/halt.c (GRUB_MOD_INIT): Improve the help message.
* commands/handler.c (GRUB_MOD_INIT): Likewise.
* commands/hdparm.c (options): Fix capitalizations and/or full stops.
* commands/hexdump.c (options): Likewise.
* commands/i386/cpuid.c (options): Likewise.
(GRUB_MOD_INIT): Likewise.
* commands/i386/pc/drivemap.c (options): Likewise.
(GRUB_MOD_INIT): Likewise.
* commands/i386/pc/halt (options): Likewise.
(GRUB_MOD_INIT): Likewise.
* commands/i386/pc/play.c (GRUB_MOD_INIT): Likewise.
* commands/i386/pc/pxecmd.c (options): Likewise.
* commands/i386/pc/vbetest.c (GRUB_MOD_INIT): Likewise.
* commands/ieee1275/suspend.c (GRUB_MOD_INIT): Likewise.
* commands/keystatus.c (options): Likewise.
(GRUB_MOD_INIT): Likewise.
* commands/loadenv.c (options): Likewise.
* commands/ls.c (options): Likewise.
* commands/lspci.c (GRUB_MOD_INIT): Likewise.
* commands/memrw.c (GRUB_MOD_INIT): Likewise.
* commands/minicmd.c (GRUB_MOD_INIT): Likewise.
* commands/parttool.c (helpmsg): Likewise.
* commands/probe.c (options): Likewise.
* commands/read.c (GRUB_MOD_INIT): Likewise.
* commands/reboot.c (GRUB_MOD_INIT): Likewise.
* commands/search.c (options): Likewise.
* commands/sleep.c (options): Likewise.
* commands/test.c (GRUB_MOD_INIT): Likewise.
* commands/true.c (GRUB_MOD_INIT): Likewise.
* commands/usbtest.c (GRUB_MOD_INIT): Likewise.
* commands/videotest.c (GRUB_MOD_INIT): Likewise.
* lib/arg.c (help_options): Likewise.
2009-12-21 22:06:04 +00:00
Felix Zielcke
ef3c2c3ad0
Remove wrong colon in my previous changelog entry
2009-12-21 22:59:52 +01:00
Felix Zielcke
4dd13225a0
2009-12-21 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkrescue.in: (process_input_dir): Copy `*.lst' files
instead of specifying them explicit.
2009-12-21 22:19:25 +01:00
Robert Millan
7922f68bb5
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* NEWS: Add grub-probe support for GNU/Hurd.
2009-12-21 21:15:38 +00:00
Robert Millan
537ce47fdf
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* NEWS: gettext was added after 1.97.
2009-12-21 21:11:16 +00:00
Robert Millan
9b214e3a53
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* util/mkisofs/msdos_partition.h: New file (based on
include/grub/msdos_partition.h).
* util/mkisofs/mkisofs.c (use_protective_msdos_label): New variable.
(OPTION_PROTECTIVE_MSDOS_LABEL): New macro.
(ld_options, main): Recognize --protective-msdos-label.
* util/mkisofs/mkisofs.h (use_protective_msdos_label): New declaration.
* util/mkisofs/write.c: Include `"msdos_partition.h"'.
(padblock_write): If `use_protective_msdos_label' is set, patch a
protective DOS-style label in the output image.
* util/grub-mkrescue.in: Use --protective-msdos-label.
2009-12-21 20:22:12 +00:00
Robert Millan
e930981361
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-mkrescue.in: Do not zero-pad image for BIOS-based disk
boot.
2009-12-21 19:10:07 +00:00
Robert Millan
0ae5692966
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* util/mkisofs/mkisofs.c (use_embedded_boot, boot_image_embed): New
variables.
(ld_options, main): Recognize `--embedded-boot'.
* util/mkisofs/mkisofs.h (use_embedded_boot, boot_image_embed): New
declarations.
* util/mkisofs/write.c (PADBLOCK_SIZE): New variable.
(padblock_size): Use `PADBLOCK_SIZE' instead of hardcoding 16.
(padblock_write): Likewise. Rewrite to support embedded boot image.
* util/grub-mkrescue.in: When building i386-pc images, embed core.img
for BIOS-based disk boot instead of only ElTorito.
2009-12-21 17:40:26 +00:00
Robert Millan
b15937b110
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-mkrescue.in: Remove `configfile' and `sh' from i386-pc
build (not needed for bootstrap).
2009-12-21 17:03:08 +00:00
Robert Millan
52cc3ce041
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-mkrescue.in: Remove `memdisk', `tar' and `search' modules
from i386-pc build (not needed for bootstrap).
Rewrite a pair of strings.
2009-12-21 16:11:35 +00:00
Robert Millan
36f5ff04dc
2009-12-21 Robert Millan <rmh.grub@aybabtu.com>
...
* normal/main.c (grub_normal_reader_init): Set left margin back to 3.
2009-12-21 15:54:56 +00:00
Vladimir 'phcoder' Serbinenko
973c6c8563
Fix ChangeLog date
2009-12-21 16:44:17 +01:00
Vladimir 'phcoder' Serbinenko
b07e53f027
2009-12-21 Vladimir Serbinenko <phcoder@gmail.com>
...
* video/i386/pc/vbe.c (grub_video_vbe_fini): Set 'last_set_mode'.
2009-12-21 16:43:21 +01:00
Andreas Born
05d2154711
2009-12-21 Andreas Born <futur.andy@googlemail.com>
...
* kern/env.c (grub_env_context_open): Mark exported variable for
reexport.
2009-12-21 15:27:50 +01:00
Andreas Born
0175d51f49
2009-12-21 Andreas Born <futur.andy@googlemail.com>
...
* kern/env.c (grub_env_export): Create nonexistent variables before
exporting.
2009-12-21 15:20:12 +01:00
carles
7f39d92f8d
2009-12-20 Carles Pina i Estany <carles@pina.cat>
...
* include/grub/auth.h: Include `<grub/i18n.h>'.
(GRUB_GET_PASSWORD): Gettextizze string.
* include/grub/normal.h (STANDARD_MARGIN): New macro, moved from
menu_text.c.
(grub_utf8_to_ucs4_alloc): Fix indentation.
(grub_print_ucs4): Likewise.
(grub_getstringwidth): Likewise.
(print_message_indented): New declaration.
* normal/auth.c: Include `<grub/i18n.h>'.
(grub_auth_check_authentication): Gettexttize string.
* normal/cmdline.c: Include `<grub/i18n.h>'.
(grub_cmdline_get): Gettextizze.
* normal/color.c: Include `<grub/i18n.h>'.
(grub_parse_color_name_pair): Gettexttize strings.
* normal/main.c (grub_normal_reader_init): Cleanup gettexttized
string (use `print_message_indented').
* normal/menu_text.c (STANDARD_MARGIN): Moved from here to
`include/grub/normal.h'.
(print_message_indented): Renamed to ...
(grub_print_message_indented): ... this. Remove `static' qualifer (now
used in normal/main.c).
(print_message): Use `grub_print_message_indented' instead of
`print_message_indented'.
(print_timeout): Likewise.
* normal/misc.c: Include `<grub/term.h>' and `<grub/i18n.h>'.
(grub_normal_print_device_info): Gettexttize strings.
* po/POTFILES: Add `auth.c', `color.c' and `misc.c'.
2009-12-20 23:32:15 +00:00
Vladimir 'phcoder' Serbinenko
3041d8989c
2009-12-20 Vladimir Serbinenko <phcoder@gmail.com>
...
* kern/parser.c (grub_parser_split_cmdline): Fix incorrect counting
of arguments. Return number of tokens and not arguments. All users
updated.
2009-12-20 22:54:12 +01:00
Vladimir 'phcoder' Serbinenko
de15bf8e7f
2009-12-20 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/i386/pc/grub-setup.c (setup): Don't install on non-GPT,
non-MSDOS paritions.
2009-12-20 21:08:03 +01:00
Vladimir 'phcoder' Serbinenko
e0a6ca52f2
2009-12-19 Vladimir Serbinenko <phcoder@gmail.com>
...
* include/grub/types.h (UNUSED): Removed since it conflicts with
NetBSD headers. All users changed to direct __attribute__ ((unused)).
Reported by Grégoire Sutre.
2009-12-20 14:09:16 +01:00
carles
b99518d1ce
2009-12-19 Carles Pina i Estany <carles@pina.cat>
...
* include/grub/normal.h (grub_utf8_to_ucs4): New declaration.
(grub_print_ucs4_alloc): Likewise.
(grub_getstringwidth): Likewise.
* normal/main.c (grub_normal_init_page): Gettextize version string.
* normal/menu_text.c (grub_utf8_to_ucs4_alloc): New definition.
(getstringwidth): Renamed to ...
(grub_getstringwidth): ... this. Remove `static' qualifier (now used
in normal/main.c). Use `grub_utf8_to_ucs4_alloc'.
(grub_print_ucs4): Remove `static' qualifer (now used in
normal/main.c).
* po/POTFILES: Add normal/main.c.
2009-12-19 23:00:30 +00:00
carles
bfd5e52b1d
2009-12-19 Carles Pina i Estany <carles@pina.cat>
...
* normal/menu_text.c (STANDARD_MARGIN): New macro.
(print_message_indented): Add `margin_left' and `margin_right'
parameters.
(print_message): Update `print_message_indented' calls. Adds '\n' to the
strings.
(print_timeout): Use `print_message_indented' to print the message.
Deletes `second_stage' parameter.
(run_menu): Update `print_timeout' calls.
2009-12-19 00:05:41 +00:00
Vladimir 'phcoder' Serbinenko
5a1ad2b9fd
2009-12-18 Vladimir Serbinenko <phcoder@gmail.com>
...
Fix console palette on OpenFirmware.
* term/ieee1275/ofconsole.c (MAX): Removed.
(colors): Redone based on VGA palette.
(grub_ofconsole_setcolor): Discard brightness bit since only 8
colors are supported.
(grub_ofconsole_init_output): Use ARRAY_SIZE instead of hardcoded size.
2009-12-18 17:25:06 +01:00
Vladimir 'phcoder' Serbinenko
b045f00a84
2009-12-18 Vladimir Serbinenko <phcoder@gmail.com>
...
Fix potential EfiEmu double prepare.
* efiemu/main.c (prepared): New variable
(grub_efiemu_unload): Set prepare to '0'.
(grub_efiemu_prepare): Return if already prepared. Set prepared.
set_virtual_address_map support.
* include/grub/efi/efi.h (grub_efi_set_virtual_address_map): New
prototype.
* include/grub/efiemu/efiemu.h (grub_efiemu_write_sym_markers): New
prototype.
(grub_efiemu_crc32): Likewise.
(grub_efiemu_crc64): Likewise.
(grub_efiemu_set_virtual_address_map): Likewise.
* include/grub/autoefi.h (grub_autoefi_exit_boot_services):
New definition.
(grub_autoefi_set_virtual_address_map): Likewise.
* kern/efi/efi.c (grub_efi_set_virtual_address_map): New function.
* loader/i386/xnu.c (grub_xnu_boot): Call set_virtual_address_map.
Restructure flow to accomodate it.
* efiemu/prepare.c (grub_efiemu_prepare): Support set_virtual_address_map.
(grub_efiemu_crc): Recompute CRC32.
* efiemu/runtime/efiemu.c (ptv_relocated): Renamed to ...
(efiemu_ptv_relocated): ... this. Made global. All users updated.
* efiemu/symbols.c (relocated_handle): New variable.
(grub_efiemu_free_syms): Free relocated_handle.
(grub_efiemu_alloc_syms): Allocate relocated_handle.
(grub_efiemu_write_sym_markers): New function.
(grub_efiemu_set_virtual_address_map): Likewise.
Newer XNU parameters.
* include/grub/i386/xnu.h (GRUB_XNU_BOOTARGS_VERMINOR): Change to 5.
* include/grub/xnu.h (grub_xnu_extheader): Add nameaddr and namesize.
(grub_xnu_fill_devicetree): New prototype.
(grub_xnu_heap_real_start): New variable.
* loader/xnu.c (get_name_ptr): New function.
(grub_xnu_load_driver): Fill namelen and name.
64-bit xnu support.
* conf/i386-efi.rmk (xnu_mod_SOURCES): Add 'loader/macho32.c'
and 'loader/macho64.c'.
* conf/i386-pc.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/i386/macho.h (grub_macho_thread64): New structure.
* include/grub/xnu.h (grub_xnu_is_64bit): New variable.
* include/grub/macho.h (grub_macho_segment64): New structure.
* include/grub/machoload.h (grub_macho32_size): Renamed from ...
(grub_macho_size32): ... to this.
(grub_macho32_get_entry_point): Renamed from ...
(grub_macho_get_entry_point32): ... to this.
(grub_macho_contains_macho64): New prototype.
(grub_macho_size64): Likewise.
(grub_macho_get_entry_point64): Likewise.
(grub_macho32_load): Renamed from ...
(grub_macho_load32): ... to this.
(grub_macho32_filesize): Renamed from ...
(grub_macho_filesize32): ... to this.
(grub_macho32_readfile): Renamed from ...
(grub_macho_readfile32): ... to this.
(grub_macho_filesize64): New prototype.
(grub_macho_readfile64): Likewise.
(grub_macho_parse32): Likewise.
(grub_macho_parse64): Likewise.
* loader/macho.c: Split into ...
* loader/machoXX.c: ... and this. Replace 32 with XX.
* loader/macho32.c: New file.
* loader/macho64.c: Likewise.
* loader/xnu.c (grub_xnu_is_64bit): New variable.
(grub_cmd_xnu_kernel): Make 32-bit only.
(grub_cmd_xnu_kernel64): New function.
(grub_xnu_load_driver): Support Mach-O 64.
(grub_cmd_xnu_mkext): Likewise.
* util/grub.d/30_os-prober.in (osx_entry): New function.
Generate entries for 64-bit boot too.
Eliminate ad-hoc tree format in XNU and EfiEmu.
* efiemu/main.c (grub_efiemu_prepare): Update comment.
* efiemu/pnvram.c: Rewritten to use environment variables.
All users updated.
Inline utf16_to_utf8.
* kern/misc.c (grub_utf16_to_utf8): Move from here ...
* include/grub/charset.h (grub_utf16_to_utf8): ... to here. Inlined.
All users updated.
* include/grub/misc.h (grub_utf16_to_utf8): Removed.
* bus/usb/usb.c (grub_usb_get_string): Move from here ...
* commands/usbtest.c (grub_usb_get_string): ... move here.
(usb_print_str): Fix error handling.
* include/grub/usb.h (grub_usb_get_string): Remove.
UTF-8 to UTF-16 transformation.
* conf/common.rmk (pkglib_MODULES): Add charset.mod
(charset_mod_SOURCES): New variable.
(charset_mod_CFLAGS): Likewise.
(charset_mod_LDFLAGS): Likewise.
* include/grub/utf.h: New file.
* lib/utf.c: New file. (Based on grub_utf8_to_ucs4 from kern/misc.c)
Support for device properties.
* include/grub/i386/xnu.h (grub_xnu_devprop_header): New structure.
(grub_xnu_devprop_device_header): Likewise.
(grub_xnu_devprop_device_descriptor): Likewise.
(grub_xnu_devprop_add_device): New prototype.
(grub_xnu_devprop_remove_device): Likewise.
(grub_xnu_devprop_remove_property): Likewise.
(grub_xnu_devprop_add_property_utf8): Likewise.
(grub_xnu_devprop_add_property_utf16): Likewise.
(grub_cpu_xnu_init): Likewise.
(grub_cpu_xnu_fini): Likewise.
(grub_cpu_xnu_unload): Likewise.
* loader/i386/xnu.c (grub_xnu_devprop_device_descriptor): New structure.
(property_descriptor): Likewise.
(devices): New variable.
(grub_xnu_devprop_remove_property): New function.
(grub_xnu_devprop_add_device): Likewise.
(grub_xnu_devprop_remove_device): Likewise.
(grub_xnu_devprop_add_property): Likewise.
(grub_xnu_devprop_add_property_utf8): Likewise.
(grub_xnu_devprop_add_property_utf16): Likewise.
(hextoval): Likewise.
(grub_cpu_xnu_fill_devprop): Likewise.
(grub_cmd_devprop_load): Likewise.
(grub_xnu_boot): Call grub_cpu_xnu_fill_devprop,
grub_xnu_fill_devicetree, grub_xnu_fill_devicetree
(cmd_devprop_load): New variable.
(grub_cpu_xnu_init): New function.
(grub_cpu_xnu_fini): Likewise.
* loader/i386/xnu.c (grub_xnu_unload): Call grub_cpu_xnu_unload.
* loader/xnu.c (grub_xnu_parse_devtree): Remove.
(grub_cmd_xnu_devtree): Likewise.
(hextoval): New function.
(unescape): Likewise.
(grub_xnu_fill_devicetree): Likewise.
* util/grub.d/30_os-prober.in: Load devprop.bin. Don't load devtree.txt.
* util/i386/efi/grub-dumpdevtree: Generate devprop.bin.
2009-12-18 15:20:21 +01:00
Vladimir 'phcoder' Serbinenko
0945f1816d
Changelog
2009-12-18 02:21:37 +01:00
Felix Zielcke
0297aafb9f
2009-12-17 Felix Zielcke <fzielcke@z-51.de>
...
* gendistlist.sh: Use POSIX compliant `!' instead of `-not' in
the `find' command.
2009-12-17 11:19:12 +01:00
Vladimir 'phcoder' Serbinenko
c179ebe4ee
2009-12-16 Vladimir Serbinenko <phcoder@gmail.com>
...
UUID support for HFS.
* fs/hfs.c (grub_hfs_uuid): New function.
(grub_hfs_fs): New value .uuid.
* include/grub/hfs.h (grub_hfs_sblock): New field 'num_serial'.
2009-12-16 15:40:31 +01:00
Felix Zielcke
574cce0cfa
2009-12-14 Felix Zielcke <fzielcke@z-51.de>
...
Fix a segfault with parsing unknown long options.
* util/grub-mkrelpath.c (options): Zero terminate it.
2009-12-14 11:06:24 +01:00
Carles Pina i Estany
c4a3e41a72
2009-12-13 Carles Pina i Estany <carles@pina.cat>
...
* include/grub/misc.h (grub_puts): New declaration.
(grub_puts_): Likewise.
* kern/mis.c (grub_puts): New definition.
(grub_puts_): Likewise.
2009-12-13 19:51:08 +00:00
Robert Millan
2e8a760287
2009-12-13 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-probe.c (probe): Improve error message.
2009-12-13 19:46:59 +00:00
Robert Millan
b50b77b9a8
Merge relocator branch
2009-12-13 18:37:44 +00:00
Vladimir 'phcoder' Serbinenko
29eb90c620
2009-12-13 Vladimir Serbinenko <phcoder@gmail.com>
...
* kern/i386/pc/startup.S (multiboot_entry): Setup stack before calling
anything.
2009-12-13 18:32:06 +01:00
Carles Pina i Estany
3102743011
2009-12-13 Carles Pina i Estany <carles@pina.cat>
...
* script/execute.c (grub_script_execute_cmdline): Set grub_errno to
GRUB_ERR_NONE before calling grub_env_set.
2009-12-13 12:35:20 +00:00
Robert Millan
dc0c71d974
2009-12-12 Robert Millan <rmh@aybabtu.com>
...
* gendistlist.sh (EXTRA_DISTFILES): Add `genvideolist.sh'.
* genmk.rb (video): New variable.
(CLEANFILES, VIDEOFILES): Add #{video}.
(#{video}): New target rule.
* genvideolist.sh: New file.
* Makefile.in (pkglib_DATA): Add video.lst.
(video.lst): New target rule.
* util/grub-mkconfig.in: Initialize ${GRUB_VIDEO_BACKEND} using
`video.lst'.
* util/grub.d/30_os-prober.in: Replace `vbe' with
${GRUB_VIDEO_BACKEND}.
2009-12-12 00:43:32 +00:00
Robert Millan
2a4bfcf0da
2009-12-11 Robert Millan <rmh.grub@aybabtu.com>
...
* THANKS: Add David Miller.
2009-12-11 22:44:47 +00:00
Robert Millan
2a3aa4d570
Merge pciaccess branch
2009-12-11 21:12:57 +00:00
Felix Zielcke
8d0502d9b2
2009-12-11 Felix Zielcke <fzielcke@z-51.de>
...
* util/misc.c: Don't include <errno.h> twice.
2009-12-11 11:11:34 +01:00
Felix Zielcke
0d56ed64d2
2009-12-10 Felix Zielcke <fzielcke@z-51.de>
...
* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Show the disk
name in an error message.
(grub_biosdisk_rw): Likewise.
2009-12-10 19:15:20 +01:00
Vladimir 'phcoder' Serbinenko
2e59983c82
2009-12-10 Vladimir Serbinenko <phcoder@gmail.com>
...
Eliminate NTFS 4Gib barrier.
* fs/ntfs.c (read_attr): Use grub_disk_addr_t and grub_size_t.
(read_run_data): Likewise.
(grub_ntfs_read_run_list): Likewise.
(grub_ntfs_read_block): Likewise.
(grub_ntfs_iterate_dir): Likewise.
(read_mft): Likewise.
(read_data): Likewise.
Use COM_LOG_LEN.
* fs/ntfscomp.c (read_block): Cast ctx->target_vcn & 0xF to unsigned
to avoid 64-bit division
* include/grub/ntfs.h (COM_LOG_LEN): New definition.
(grub_ntfs_rlst): Use grub_disk_addr_t.
2009-12-10 14:45:00 +01:00
Vladimir 'phcoder' Serbinenko
71ee178adb
2009-12-10 Vladimir Serbinenko <phcoder@gmail.com>
...
Eliminate grub-fstest 4Gib barrier.
* util/grub-fstest.c (skip, leng): Use grub_disk_addr_t.
(read_file): Fix error reporting.
2009-12-10 14:39:54 +01:00
Vladimir 'phcoder' Serbinenko
2520d4b815
2009-12-10 Vladimir Serbinenko <phcoder@gmail.com>
...
Eliminate hexdump 4Gib barrier.
* commands/hexdump.c (grub_cmd_hexdump): Use grub_disk_addr_t.
* lib/arg.c (grub_arg_parse): Use grub_strtoull.
2009-12-10 14:37:42 +01:00
Vladimir 'phcoder' Serbinenko
e1f270654e
2009-12-10 Vladimir Serbinenko <phcoder@gmail.com>
...
* kern/device.c (grub_device_iterate): Ignore errors during first scan.
Fixes amarsh bug.
2009-12-10 13:26:22 +01:00
Robert Millan
1a0f7f4553
2009-12-09 Bruce Dubbs <bruce.dubbs@gmail.com>
...
Remove miscellaneous files in distclean target.
* Makefile.in: Remove docs/{grub.info,version.texi,stamp-vti}
2009-12-09 21:43:05 +00:00
Colin Watson
c631d9fb17
2009-12-09 Colin Watson <cjwatson@ubuntu.com>
...
* util/grub-mkconfig_lib.in: Don't set grub_probe or grub_mkrelpath
if they're already set. This resolves the conflict between my
grub-install change on 2009-10-06 and Felix' change on 2009-11-11,
fixing the --grub-probe option again.
* util/sparc64/ieee1275/grub-install.in: Revert the last piece of my
change on 2009-10-06, so that we now once again source
`${libdir}/grub/grub-mkconfig_lib' after options have been parsed.
2009-12-09 16:20:17 +00:00
Robert Millan
7c7b610626
2009-12-08 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/common.rmk [sparc64-ieee1275] (grub_mkdevicemap_SOURCES): Use
`util/ieee1275/ofpath.c' and `util/ieee1275/devicemap.c' instead of
`util/devicemap.c'.
2009-12-08 16:00:52 +00:00
Carles Pina i Estany
e3069ec1a5
2009-12-08 Carles Pina i Estany <carles@pina.cat>
...
* include/grub/misc.h (grub_printf_): New declaration.
* kern/misc.c (grub_printf_): New definition.
* normal/main.c (grub_normal_reader_init): Use `grub_printf_' and `N_'
instead of `grub_printf' and `_'.
* normal/menu_entry.c (store_completion): Likewise.
(run): Likewise.
(grub_menu_entry_run): Likewise.
* normal/menu_text.c (grub_wait_after_message): Likewise.
(notify_booting): Likewise.
(notify_fallback): Likewise.
(notify_execution_failure): Likewise.
2009-12-08 00:08:52 +00:00
Colin Watson
d6ceebf1d9
2009-12-07 Colin Watson <cjwatson@ubuntu.com>
...
* configure.ac: Check for vasprintf.
* util/misc.c (asprintf): Move allocation from here ...
(vasprintf): ... to here. New function.
(xasprintf): New function.
* include/grub/util/misc.h (vasprintf, xasprintf): Add
prototypes.
* util/getroot.c (grub_util_get_grub_dev): Use xasprintf.
* util/grub-mkfont.c (write_font): Likewise.
* util/grub-probe.c (probe): Likewise.
* util/hostdisk.c (make_device_name): Likewise.
2009-12-07 16:46:24 +00:00
David S. Miller
de6daa8b56
2009-12-06 David S. Miller <davem@sunset.davemloft.net>
...
* disk/ieee1275/ofdisk.c (grub_ofdisk_iterate): Recognize
anything even prefixed with 'cdrom' as a cdrom.
2009-12-07 11:54:25 +01:00
Felix Zielcke
df91e67900
2009-12-06 Felix Zielcke <fzielcke@z-51.de>
...
* util/misc.c (make_system_path_relative_to_its_root): Correctly cope with
mount points.
2009-12-06 10:20:01 +01:00
Carles Pina i Estany
98d3dc02fe
2009-12-05 Carles Pina i Estany <carles@pina.cat>
...
* gettext/gettext.c: Include `<grub/list.h>'. Define grub_gettext_msg,
grub_gettext_msg_list.
(grub_gettext_gettranslation_from_position): Return const char *
and not char *.
(grub_gettext_translate): Add the translated strings into a list,
returns from the list if existing there.
(grub_gettext_init_ext): Add \n at the end of grub_dprintf string.
(grub_gettext_delete_list): Delete the list.
(grub_gettext_env_write_lang): Call grub_gettext_delete_list when
lang environment variable is changed.
(GRUB_MOD_FINI): Call grub_gettext_delete_list.
2009-12-05 19:03:27 +00:00
Vladimir 'phcoder' Serbinenko
b283f10857
2009-12-05 Vladimir Serbinenko <phcoder@gmail.com>
...
Rename kernel.mod to kernel.img.
* conf/i386-efi.rmk (pkglib_MODULES): Change kernel.mod to kernel.img.
(kernel_mod_EXPORTS): Rename to ...
(kernel_img_EXPORTS): ... this.
(kernel_mod_SOURCES): Rename to ...
(kernel_img_SOURCES): ... this.
(kernel_mod_HEADERS): Rename to ...
(kernel_img_HEADERS): ... this. All users updated.
(kernel_mod_CFLAGS): Rename to ...
(kernel_img_CFLAGS): ... this.
(kernel_mod_ASFLAGS): Rename to ...
(kernel_img_ASFLAGS): ... this.
(kernel_mod_LDFLAGS): Rename to ...
(kernel_img_LDFLAGS): ... this.
* conf/x86_64-efi.rmk: Likewise.
* util/i386/efi/grub-mkimage.c (read_kernel_module): Rename to ...
(read_kernel_image): ... this. All users updated.
(read_kernel_image): Read "kernel.img" instead of "kernel.mod".
2009-12-05 17:10:36 +01:00
Carles Pina i Estany
69055f8a2f
2009-12-05 Carles Pina i Estany <carles@pina.cat>
...
* normal/menu_text.c (grub_color_menu_high): Gettexttize string.
(print_spaces): New function.
(grub_print_ucs4): New function.
(getstringwidth): New function.
(print_message_indented): New function.
(print_message): Gettexttize strings using print_message_indented.
(run_menu): Replaces grub_printf by print_spaces and dynamic terminal
width.
(get_entry_number): Gettextize and uses dynamic terminal width.
(notify_booting, notify_fallback, notify_execution_failure):
Gettextize.
* normal/menu_entry.c (store_completion): Cleanup the gettextized
string.
(run): Likewise.
(grub_menu_entry_run): Likewise.
* PO/POTFILES: Add normal/menu_entry.c.
2009-12-05 11:25:07 +00:00
Vladimir 'phcoder' Serbinenko
f616f51c3c
2009-12-05 Vladimir Serbinenko <phcoder@gmail.com>
...
* configure.ac (TARGET_ASFLAGS): Add "-D<MACHINE>".
2009-12-05 11:08:26 +01:00
Carles Pina i Estany
57bbe3beb1
2009-12-05 Carles Pina i Estany <carles@pina.cat>
...
* util/grub-install.in: Install gettext .mo files.
* util/grub-mkrescue.in (process_input_dir): Copy gettext .mo files.
2009-12-05 09:31:36 +00:00
Carles Pina i Estany
013d67a149
2009-12-05 Carles Pina i Estany <carles@pina.cat>
...
* gettext/gettext.c (grub_gettext_init_ext): Replace grub_printf with
grub_dprintf.
2009-12-05 09:25:46 +00:00
Robert Millan
fb954db0d5
2009-12-05 Robert Millan <rmh.grub@aybabtu.com>
...
* kern/ieee1275/openfw.c (grub_reboot): Disable for i386. The
non-firmware-dependant one in realmode.S takes precedence.
2009-12-05 01:43:17 +00:00
Robert Millan
6b8474f8e8
2009-12-04 Robert Millan <rmh.grub@aybabtu.com>
...
* commands/halt.c: Replace misc arch-specific headers with
`<grub/misc.h>'.
* commands/reboot.c: Likewise.
* commands/i386/pc/halt.c: Replace `<grub/machine/init.h>' with
`<grub/misc.h>'.
* conf/i386-coreboot.rmk (kernel_img_HEADERS): Remove `cpu/reboot.h'.
(halt_mod_SOURCES): Move `kern/i386/halt.c' from here ...
(kernel_img_SOURCES): ... to here.
* include/grub/efi/efi.h (grub_reboot, grub_halt): Remove prototypes.
* include/grub/i386/pc/init.h: Likewise.
* include/grub/powerpc/ieee1275/kernel.h: Likewise.
* include/grub/sparc64/ieee1275/kernel.h: Likewise.
* include/grub/misc.h (grub_reboot, grub_halt): New prototypes.
* include/grub/i386/halt.h: Remove.
* include/grub/i386/reboot.h: Likewise.
* kern/i386/halt.c: Remove `<grub/cpu/halt.h>'.
2009-12-03 23:07:29 +00:00
David S. Miller
4b2e6ca2b6
2009-12-03 David S. Miller <davem@sunset.davemloft.net>
...
* conf/sparc64-ieee1275.rmk (grub_mkimage_SOURCES,
grub_setup_SOURCES, grub_ofpathname_SOURCES): Add gnulib/progname.c
* util/sparc64/ieee1275/grub-mkimage.c: Include <grub/i18n.h> and
"progname.h"
* util/sparc64/ieee1275/grub-ofpathname.c: Likewise.
* util/sparc64/ieee1275/grub-setup.c: Likewise.
(usage): Add missing comma in printf.
2009-12-03 12:18:56 +01:00
Robert Millan
5239348f18
2009-12-02 Robert Millan <rmh.grub@aybabtu.com>
...
Use the same reboot approach on i386 coreboot and qemu as we do on
BIOS.
* conf/i386-coreboot.rmk (kernel_img_HEADERS): Add `cpu/reboot.h'.
(reboot_mod_SOURCES): Remove `kern/i386/reboot.c'.
* kern/i386/reboot.c: Remove.
* include/grub/i386/reboot.h (grub_reboot): Export function.
* kern/i386/pc/startup.S (grub_reboot): Move from here ...
* kern/i386/realmode.S (grub_reboot): ... to here. Jump to
0xf000:0xfff0 instead of 0xffff:0x0000.
[!GRUB_MACHINE_PCBIOS] (prot_to_real): Do not restore interrupts.
* kern/i386/qemu/startup.S: Include `"../realmode.S"'.
2009-12-02 22:48:02 +00:00
Robert Millan
ef34cbd4fa
2009-11-30 Robert Millan <rmh.grub@aybabtu.com>
...
Fix $srcdir != $objdir build.
* Makefile.in (po/%.po): Rewrite as ...
($(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po)): ... this.
2009-11-30 01:25:57 +00:00
Samuel Thibault
dc9837ea5f
2009-11-29 Samuel Thibault <samuel.thibault@ens-lyon.org>
...
Fix GNU/Hurd grub-install crash.
* util/grub-probe.c (probe): Try to access `path' only when it is not
NULL.
2009-11-29 12:40:32 +01:00
Vladimir 'phcoder' Serbinenko
2f857f9813
2009-11-28 Vladimir Serbinenko <phcoder@gmail.com>
...
Correct module naming.
* video/efi_uga.c (GRUB_MOD_INIT(efi_fb)): Renamed from this ...
(GRUB_MOD_INIT(efi_uga)): ... to this
(GRUB_MOD_FINI(efi_fb)): Renamed from this ...
(GRUB_MOD_FINI(efi_uga)): ... to this
* video/efi_gop.c (GRUB_MOD_INIT(efi_fb)): Renamed from this ...
(GRUB_MOD_INIT(efi_gop)): ... to this
(GRUB_MOD_FINI(efi_fb)): Renamed from this ...
(GRUB_MOD_FINI(efi_gop)): ... to this
2009-11-28 20:40:44 +01:00
Robert Millan
c5448046d3
2009-11-28 Robert Millan <rmh.grub@aybabtu.com>
...
* util/mkisofs/mkisofs.c (ld_options): Mark all `arg' strings as
translatable.
(usage): Translate `arg' strings using gettext().
Thanks to Jordi Mallach for the suggestion.
2009-11-28 19:31:30 +00:00
Vladimir 'phcoder' Serbinenko
c85184ad3d
2009-11-28 Vladimir Serbinenko <phcoder@gmail.com>
...
GOP support. Based on patch from Bean
(http://lists.gnu.org/archive/html/grub-devel/2009-08/msg00384.html )
* video/efi_gop.c: New file.
* include/grub/efi/graphics_output.h: Likewise.
* conf/i386-efi.rmk (pkglib_MODULES): Add `efi_gop.mod'.
(efi_fb_mod_SOURCES, efi_fb_mod_CFLAGS, efi_fb_mod_LDFLAGS): New
variables.
* conf/x86_64-efi.rmk: Likewise.
2009-11-28 00:24:57 +01:00
Vladimir 'phcoder' Serbinenko
8a4c48d86f
2009-11-28 Vladimir Serbinenko <phcoder@gmail.com>
...
Rename efi_fb to efi_uga.
* conf/i386-efi.rmk (pkglib_MODULES): Rename 'efi_fb.mod' to
'efi_uga.mod'.
(efi_fb_mod_SOURCES): Rename this ...
(efi_uga_mod_SOURCES): ... to this.
(efi_fb_mod_CFLAGS): Rename this ...
(efi_uga_mod_CFLAGS): ... to this.
(efi_fb_mod_LDFLAGS): Rename this ...
(efi_uga_mod_LDFLAGS): ... to this.
* conf/x86_64-efi.rmk (pkglib_MODULES): Rename 'efi_fb.mod' to
'efi_uga.mod'.
(efi_fb_mod_SOURCES): Rename this ...
(efi_uga_mod_SOURCES): ... to this.
(efi_fb_mod_CFLAGS): Rename this ...
(efi_uga_mod_CFLAGS): ... to this.
(efi_fb_mod_LDFLAGS): Rename this ...
(efi_uga_mod_LDFLAGS): ... to this.
* video/efi_fb.c: Move this ...
* video/efi_uga.c: ... to this. Change prefix to 'grub_video_uga_'.
2009-11-28 00:13:51 +01:00
Robert Millan
fb6c1a7b25
2009-11-27 Robert Millan <rmh.grub@aybabtu.com>
...
* po/README: New file. Explain our PO file workflow.
2009-11-27 17:33:35 +00:00
Robert Millan
3bc7896c1a
2009-11-27 Robert Millan <rmh.grub@aybabtu.com>
...
* po/ChangeLog: Remove. Move relevant entries back to ...
* ChangeLog: ... here.
* po/ca.po: Remove (now handled by TLP).
* po/id.po: Likewise.
* po/zh_CN.po: Likewise.
* Makefile.in (LINGUAS): Initialize in a way that supports
empty set.
2009-11-27 17:11:38 +00:00
Robert Millan
9ed4841d7a
2009-11-27 Robert Millan <rmh.grub@aybabtu.com>
...
* Makefile.in (LINGUAS): Rewrite by scanning po/ directory instead of
reliing on po/LINGUAS.
($(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po)): Rewrite as ...
(po/%.po): ... this.
2009-11-27 16:46:00 +00:00
Felix Zielcke
242668a26a
2009-11-26 Felix Zielcke <fzielcke@z-51.de>
...
* util/i386/efi/grub-mkimage.c: Include "progname.h".
(main): Use `program_name' instead of nonexistent `progname'.
2009-11-26 17:15:16 +01:00
Felix Zielcke
e30dd39296
2009-11-26 Felix Zielcke <fzielcke@z-51.de>
...
* conf/i386-efi.rmk (grub_mkimage_SOURCES): Add `gnulib/progname.c'.
* conf/x86_64-efi.rmk (grub_mkimage_SOURCES): Likewise.
2009-11-26 16:29:06 +01:00
Robert Millan
7656de4f5b
2009-11-26 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/i386-coreboot.rmk: Cleanup stale filenames from my previous
commit.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
2009-11-26 00:45:53 +00:00
Felix Zielcke
db77c4d43c
2009-11-26 Felix Zielcke <fzielcke@z-51.de>
...
* conf/any-emu.rmk (grub_emu_SOURCES): Add `gnulib/progname.c'.
2009-11-26 01:08:42 +01:00
Felix Zielcke
a755bb0437
2009-11-26 Felix Zielcke <fzielcke@z-51.de>
...
* conf/any-emu.rmk (grub_mkfont_SOURCES): Add `gnulib/progname.c'.
2009-11-26 00:52:55 +01:00
Robert Millan
8a4c07fd6a
2009-11-26 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/common.rmk (sbin_UTILITIES): Add `grub-mkdevicemap'.
(grub_mkdevicemap_SOURCES): New variable.
(grub_probe_SOURCES, grub_fstest_SOURCES, grub_mkfont_SOURCES)
(grub_mkrelpath_SOURCES, grub_editenv_SOURCES)
(grub_pe2elf_SOURCES): Add `gnulib/progname.c'.
* conf/i386-coreboot.rmk (sbin_UTILITIES): Remove `grub-mkdevicemap'.
(grub_mkdevicemap_SOURCES): Remove.
* 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.
* util/elf/grub-mkimage.c: Include `<grub/i18n.h>' and `"progname.h"'.
(usage): Fix strings to use `program_name'.
(main): Initialize gettext.
* 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-mkrelpath.c: Likewise.
* util/grub-pe2elf.c: Likewise.
* util/grub-probe.c: Likewise.
* util/sparc64/ieee1275/grub-mkimage.c: Likewise.
* util/sparc64/ieee1275/grub-ofpathname.c: Likewise.
* util/sparc64/ieee1275/grub-setup.c: Likewise.
* util/misc.c: Include `"progname.h"'.
(progname): Remove variable.
(grub_util_warn, grub_util_info, grub_util_error): Use `program_name'.
2009-11-25 23:10:02 +00:00
Felix Zielcke
6f61ed5513
2009-11-25 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub.d/10_linux.in (linux_entry): Quote the arguments to
printf and print a newline after the menuentry header line.
* util/grub.d/10_kfreebsd.in (kfreebsd_entry): Likewise.
2009-11-25 19:13:35 +01:00
Felix Zielcke
f022876b03
2009-11-25 Felix Zielcke <fzielcke@z-51.de>
...
autoconf >= 2.60 support $(localedir).
* INSTALL: Note that autoconf 2.60 is required.
* configure.ac (AC_PREREQ): Bump to 2.60.
* util/grub.d/10_kfreebsd.in (TEXTDOMAINDIR): Set to lowercased @localedir@.
* util/grub.d/10_linux.in (TEXTDOMAINDIR): Likewise.
2009-11-25 18:37:04 +01:00
Yves Blusseau
6717926e6e
2009-11-25 Yves Blusseau <yves.blusseau@zetam.org>
...
* configure.ac: move the call to AM_GNU_GETTEXT to avoid warnings when
aclocal is run.
2009-11-25 12:23:16 +01:00
Robert Millan
08806a54c5
2009-11-25 Robert Millan <rmh.grub@aybabtu.com>
...
* normal/main.c (grub_normal_read_line): Fix off-by-one
buffer overflow..
2009-11-25 03:48:33 +00:00
Robert Millan
13b33fba6f
2009-11-25 Robert Millan <rmh.grub@aybabtu.com>
...
* normal/main.c (grub_normal_execute): Replace "parser.sh" with
"parser.grub" in grub_command_execute() call.
2009-11-25 01:50:33 +00:00
Carles Pina i Estany
4a8572e9d8
2009-11-24 Carles Pina i Estany <carles@pina.cat>
...
* conf/i386-coreboot.rmk (kernel_img_HEADERS): Add i18n.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.
* gettext/gettex.c: Include <grub/i18n.h>.
* include/grub/misc.h (grub_gettext_dummy, grub_gettext): Move from
here ...
* include/grub/i18n.h: ... to here
* include/grub/i18n.h: ... to here.
* kern/misc.c: Include <grub/i18n.h>
(grub_gettext_dummy): Move above user.
2009-11-24 21:42:14 +00:00
Felix Zielcke
bee48093d6
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* util/Makefile.in (install-local): Convert a `for' into a normal
shell expansion.
2009-11-24 21:01:40 +01:00
Robert Millan
a031e91cf8
2009-11-24 Robert Millan <rmh.grub@aybabtu.com>
...
* autogen.sh: Add automake call.
* config.guess: Remove.
* config.sub: Likewise.
* install-sh: Likewise.
2009-11-24 18:51:35 +00:00
Felix Zielcke
26bec39d67
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* util/Makefile.in (install-local): Fix the use of $lang shell variable.
2009-11-24 19:44:24 +01:00
Felix Zielcke
8e2532fd0f
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* util/Makefile.in (install-local): Convert a make `$(foreach)'
function to a normal shell `for'.
2009-11-24 18:43:46 +01:00
Felix Zielcke
fefa1b7deb
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* conf/i386-coreboot.rmk (grub_mkimage_SOURCES): Add `gnulib/progname.c'.
2009-11-24 15:47:48 +01:00
Felix Zielcke
4501250b6c
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkrelpath.c: New file.
* conf/common.rmk (bin_UTILITIES): Add grub-mkrelpath.
(grub_mkrelpath_SOURCES): New variable.
* include/grub/util/misc.h: New function prototype.
* util/misc.c (make_system_path_relative_to_its_root): New function.
* util/grub-mkconfig_lib.in (bindir): New variable.
(grub_mkrelpath): Likewise.
(make_system_path_relative_to_its_root): Use grub-mkrelpath.
* util/probe.c (probe): Make the file path relative to its root.
Change a info message to use the GRUB path. Enable again the
check if we can read the file with GRUB facilities.
* util/i386/pc/grub-setup.c (setup): Make core.img path relative
to its root.
2009-11-24 15:00:25 +01:00
Felix Zielcke
11d9778b86
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* Makefile.in: Don't include GRUB_CONTRIB makefiles with emu
platform.
2009-11-24 12:29:17 +01:00
Robert Millan
285cd7ddd5
Move ChangeLog entries affecting po/ directory to po/ChangeLog
2009-11-24 10:45:26 +00:00
Felix Zielcke
4465287d1b
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* util/getroot.c (grub_util_get_dev_abstraction): Properly use
strncmp().
2009-11-24 09:55:28 +01:00
Felix Zielcke
62b47f220a
2009-11-24 Felix Zielcke <fzielcke@z-51.de>
...
* util/getroot.c (grub_util_is_dmraid): New function.
(grub_util_get_dev_abstraction): Treat dmraid and multipath
devices as normal ones, not as LVM.
2009-11-24 08:20:48 +01:00
Robert Millan
662290ce76
2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
...
* po/id.po: New file.
* LINGUAS: Add `id'.
2009-11-23 22:41:37 +00:00
Carles Pina i Estany
1eafb9b92b
* Fixes date in the ChangeLog entry
2009-11-23 21:29:39 +00:00
Carles Pina i Estany
c3ea6bd466
Final touches before merging
2009-11-23 20:59:24 +00:00
Robert Millan
0fdb256813
2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
...
* util/hostdisk.c: Include `<grub/i18n.h>'.
(find_grub_drive): Use ARRAY_SIZE for map size calculation.
(make_device_name): Rewrite using asprintf.
(convert_system_partition_to_system_disk): Replace 0 with NULL.
(find_system_device): If a device is not found, generate one just
by reusing the OS path name.
(read_device_map): Make it permissible for device.map not to exist.
2009-11-23 20:30:56 +00:00
Robert Millan
f515aa6224
2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
...
* script/sh/execute.c: Move from here ...
* script/execute.c: ... to here. Update all users.
* script/sh/function.c: Move from here ...
* script/function.c: ... to here. Update all users.
* script/sh/lexer.c: Move from here ...
* script/lexer.c: ... to here. Update all users.
* script/sh/main.c: Move from here ...
* script/main.c: ... to here. Update all users.
* script/sh/parser.y: Move from here ...
* script/parser.y: ... to here. Update all users.
* script/sh/script.c: Move from here ...
* script/script.c: ... to here. Update all users.
2009-11-23 15:37:33 +00:00
Robert Millan
f84b481b35
Cheery-pick grub-emu split from experimental (rev 1361)
...
2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
* configure.ac: Detect all `emu' platforms. Define
GRUB_MACHINE_* macros in TARGET_CFLAGS. Remove
--enable-grub-emu logic. Disable include/grub/machine
symlink on `emu' platforms.
* genkernsyms.sh.in: Use @TARGET_CFLAGS@ during symbol generation.
* gensymlist.sh.in: Likewise.
* include/grub/i386/coreboot/machine.h: Remove file.
* include/grub/i386/efi/machine.h: Likewise.
* include/grub/i386/ieee1275/machine.h: Likewise.
* include/grub/i386/pc/machine.h: Likewise.
* include/grub/i386/qemu/machine.h: Likewise.
* include/grub/powerpc/ieee1275/machine.h: Likewise.
* include/grub/sparc64/ieee1275/machine.h: Likewise.
* include/grub/x86_64/efi/machine.h: Likewise.
* commands/acpi.c: Remove `<grub/machine/machine.h>'.
* commands/halt.c: Likewise.
* commands/reboot.c: Likewise.
* include/grub/autoefi.h: Likewise.
* include/grub/i386/at_keyboard.h: Likewise.
* include/grub/i386/kernel.h: Likewise.
* include/grub/i386/loader.h: Likewise.
* include/grub/i386/pc/memory.h: Likewise.
* kern/dl.c: Likewise.
* kern/i386/coreboot/init.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/usb_keyboard.c: Likewise.
* include/grub/time.h [!GRUB_MACHINE_EMU]: Remove
`<grub/machine/machine.h>'
[!GRUB_MACHINE_EMU] (GRUB_TICKS_PER_SECOND): New macro.
* util/misc.c: Remove `<grub/machine/machine.h>' and
`<grub/machine/time.h>'.
* Makefile.in (enable_grub_emu): Remove variable.
Include $(srcdir)/conf/any-emu.mk for the `emu' platform.
* conf/any-emu.rmk: New file.
* conf/common.rmk (grub_emu_init.lst, grub_emu_init.h)
(grub_emu_init.c): Move from here ...
* conf/any-emu.rmk: ... to here.
* conf/i386-coreboot.rmk (sbin_UTILITIES): Remove `grub-emu'.
(grub_emu_SOURCES, grub_emu_LDFLAGS): Move from here ...
* conf/any-emu.rmk: ... to here.
2009-11-23 15:31:54 +00:00
Robert Millan
4efeab03dc
2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/parser.h (grub_parser_register): Document need
of `name' parameter.
* normal/main.c (grub_normal_read_line): Simplify prompt string.
* script/sh/main.c (grub_sh_parser, GRUB_MOD_INIT(sh)): Rename
"sh" to "grub".
2009-11-23 15:23:55 +00:00
Robert Millan
ea1dd8bf0a
2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
...
* Makefile.in ($(srcdir)/po/$(PACKAGE).pot): Pass --keyword=N_ to
`$(XGETTEXT)'.
* include/grub/i18n.h (N_): New macro.
* util/mkisofs/mkisofs.h: Likewise.
* util/mkisofs/mkisofs.c (ld_options): Wrap all translatable strings
around N_().
(usage): Use gettext() to translate help strings when printing them.
2009-11-23 13:18:07 +00:00
Robert Millan
0c14062641
2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
...
Based on patch from Bean
(http://lists.gnu.org/archive/html/grub-devel/2009-08/msg00384.html )
* video/efi_fb.c: New file.
* conf/i386-efi.rmk (pkglib_MODULES): Add `efi_fb.mod'.
(efi_fb_mod_SOURCES, efi_fb_mod_CFLAGS, efi_fb_mod_LDFLAGS): New
variables.
* conf/x86_64-efi.rmk: Likewise.
2009-11-23 11:17:50 +00:00
Robert Millan
87d58298fd
2009-11-22 Robert Millan <rmh.grub@aybabtu.com>
...
* util/i386/pc/grub-mkimage.c: Ungettextize grub_util_info() strings.
* util/i386/pc/grub-setup.c: Likewise.
2009-11-22 10:20:14 +00:00
Felix Zielcke
8e3be195c4
Merge remote
2009-11-21 23:25:20 +01:00
Felix Zielcke
26a61d6a59
2009-11-21 Felix Zielcke <fzielcke@z-51.de>
...
* Makefile.in (target): Use make's builtin $(shell) function
instead of calling directly $(SHELL) to create the locale directories,
inside the $(foreach) function.
2009-11-21 23:23:35 +01:00
Samuel Thibault
994cc3a308
2009-11-21 Samuel Thibault <samuel.thibault@ens-lyon.org>
...
* util/getroot.c [__GNU__]: Include <hurd.h>, <hurd/lookup.h>, and
<hurd/fs.h>
[__GNU__] (grub_guess_root_device): Call file_name_lookup and
file_get_storage_info to implement grub_guess_root_device.
2009-11-21 18:00:23 +01:00
Felix Zielcke
74ff1dd52b
2009-11-21 Felix Zielcke <fzielcke@z-51.de>
...
* util/grub-mkrescue.in: Print an error and usage if output option
has not been given.
2009-11-21 17:40:55 +01:00
Felix Zielcke
97951fb232
Merge trunk
2009-11-21 15:49:21 +01:00
Felix Zielcke
0b787d0e99
2009-11-21 Felix Zielcke <fzielcke@z-51.de>
...
Patch from Loïc Minier <loic.minier@ubuntu.com>.
* util/grub.d/30_os-prober.in: Cope with Linux entries where
root and /boot are on different devices.
2009-11-21 15:41:46 +01:00
Robert Millan
1164b2708e
2009-11-21 Robert Millan <rmh.grub@aybabtu.com>
...
Fix build for srcdir != objdir.
* Makefile.in (po/$(PACKAGE).pot): Rename to ...
($(srcdir)/po/$(PACKAGE).pot): ... this. Run $(XGETTEXT) from
$(srcdir).
($(foreach lang, $(LINGUAS), po/$(lang).po)): Rename to ...
($(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po): ... this. Use $^
reference for input.
2009-11-21 13:48:15 +00:00
Robert Millan
13774a2f94
2009-11-21 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-mkrescue.in: Use source directory direcly (without copiing
or hardlinking it). Remove -J option, Joliet is not compatible with
multiple source directories.
2009-11-21 13:22:41 +00:00
Robert Millan
efda854e68
2009-11-21 Carles Pina i Estany <carles@pina.cat>
...
2009-11-21 Robert Millan <rmh.grub@aybabtu.com>
* util/grub-mkrescue.in: Recognize `--override-directory' option.
(process_input_dir): New function. Process an arbitrary input
directory.
Misc adjustments to support both "override mode" and system-wide mode.
2009-11-21 13:11:38 +00:00
Felix Zielcke
6c09890c87
2009-11-20 Felix Zielcke <fzielcke@z-51.de>
...
* configure.ac (UNIFONT_BDF): Rename to ...
(FONT_SOURCE): ... this. Update all users.
2009-11-20 22:39:07 +01:00
Felix Zielcke
a797824f12
2009-11-20 Felix Zielcke <fzielcke@z-51.de>
...
* configure.ac: Add `/usr/share/fonts/X11/misc/unifont.pcf.gz'
to the list of unifont files to look for.
2009-11-20 21:08:29 +01:00
Robert Millan
cd4f42b0c1
2009-11-19 Robert Millan <rmh.grub@aybabtu.com>
...
Patch from Joe Auricchio <jauricchio@gmail.com>
* commands/minicmd.c (grub_mini_cmd_clear): New function.
(GRUB_MOD_INIT(minicmd)): Register grub_mini_cmd_clear().
(GRUB_MOD_FINI(minicmd)): Unregister grub_mini_cmd_clear().
2009-11-19 10:39:14 +00:00
Felix Zielcke
393c783d02
2009-11-19 Felix Zielcke <fzielcke@z-51.de>
...
* Makefile.in (install-local): Add a missing backslash.
2009-11-19 10:07:35 +01:00
Felix Zielcke
b2f1e32746
2009-11-19 Felix Zielcke <fzielcke@z-51.de>
...
* include/grub/x86_64/io.h: New file.
2009-11-19 09:33:56 +01:00
Robert Millan
f577f7a09d
2009-11-19 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/i386-pc.rmk (grub_setup_SOURCES): Add `gnulib/progname.c'.
* util/i386/pc/grub-setup.c: Include `<grub/i18n.h>'.
Include `"progname.h"'.
(main): Initialize gettext.
* util/i386/pc/grub-setup.c: Gettexttize.
* util/i386/pc/grub-mkimage.c: Likewise.
* Makefile.in (po/*.po): Redefine as ...
($(foreach lang, $(LINGUAS), po/$(lang).po)): ... this.
* po/POTFILES: Add `util/i386/pc/grub-setup.c'.
2009-11-18 23:20:22 +00:00
Robert Millan
6323f70508
Document util/mkisofs/mkisofs.h change properly in previous ChangeLog entry ...
2009-11-18 23:11:03 +00:00
Robert Millan
c37943b642
Forgot to commit ChangeLog...
2009-11-18 23:07:24 +00:00
Robert Millan
5ce77c6e7e
2009-11-18 Robert Millan <rmh.grub@aybabtu.com>
...
* util/mkisofs/eltorito.c: Fix minor mistake in license text.
* util/mkisofs/iso9660.h: Likewise.
* util/mkisofs/joliet.c: Likewise.
* util/mkisofs/mkisofs.c: Likewise.
* util/mkisofs/mkisofs.h: Likewise.
* util/mkisofs/rock.c: Likewise.
* util/mkisofs/tree.c: Likewise.
* util/mkisofs/write.c: Likewise.
* util/mkisofs/eltorito.c (rcsid): Remove.
* util/mkisofs/hash.c: Likewise.
* util/mkisofs/joliet.c: Likewise.
* util/mkisofs/name.c: Likewise.
* util/mkisofs/rock.c: Likewise.
* util/mkisofs/tree.c: Likewise.
* util/mkisofs/write.c: Likewise.
2009-11-18 22:59:40 +00:00
Robert Millan
1dabbc77cf
2009-11-18 Robert Millan <rmh.grub@aybabtu.com>
...
* util/mkisofs/match.c: Rewrite from scratch, using a linked list
instead of static allocation.
* util/mkisofs/match.h: Likewise.
2009-11-18 22:49:59 +00:00
Robert Millan
633877cbb1
2009-11-18 Robert Millan <rmh.grub@aybabtu.com>
...
* po/POTFILES-shell: New file. List `util/grub.d/10_kfreebsd.in'
and `util/grub.d/10_linux.in'.
* Makefile.in (po/$(PACKAGE).pot): Process `po/POTFILES-shell' for
translatable Shell files.
2009-11-18 21:03:09 +00:00
Robert Millan
af1c0c85a7
2009-11-18 Robert Millan <rmh.grub@aybabtu.com>
...
* Makefile.in ($(srcdir)/aclocal.m4): New target.
2009-11-18 20:57:57 +00:00
Robert Millan
769ae37bfd
Merge my gettext branch (gettext support in build system for GRUB utilities)
2009-11-17 20:23:06 +00:00
Robert Millan
02c0a6ad1d
Merge libgcrypt branch.
...
2009-11-17 Robert Millan <rmh.grub@aybabtu.com>
* import_gcry.py: New file (written by Vladimir with minor
adjustments).
* autogen.sh: Use import_gcry.py to auto-generate GRUB-ified
ciphers.
* INSTALL: Document that Python is required for bootstrap.
2009-11-17 Robert Millan <rmh.grub@aybabtu.com>
Import ciphers from libgcrypt 1.4.4.
* lib/libgcrypt/cipher/ChangeLog
* lib/libgcrypt/cipher/ac.c
* lib/libgcrypt/cipher/arcfour.c
* lib/libgcrypt/cipher/bithelp.h
* lib/libgcrypt/cipher/blowfish.c
* lib/libgcrypt/cipher/camellia-glue.c
* lib/libgcrypt/cipher/camellia.c
* lib/libgcrypt/cipher/camellia.h
* lib/libgcrypt/cipher/cast5.c
* lib/libgcrypt/cipher/cipher.c
* lib/libgcrypt/cipher/crc.c
* lib/libgcrypt/cipher/des.c
* lib/libgcrypt/cipher/dsa.c
* lib/libgcrypt/cipher/ecc.c
* lib/libgcrypt/cipher/elgamal.c
* lib/libgcrypt/cipher/hash-common.c
* lib/libgcrypt/cipher/hash-common.h
* lib/libgcrypt/cipher/hmac-tests.c
* lib/libgcrypt/cipher/md.c
* lib/libgcrypt/cipher/md4.c
* lib/libgcrypt/cipher/md5.c
* lib/libgcrypt/cipher/primegen.c
* lib/libgcrypt/cipher/pubkey.c
* lib/libgcrypt/cipher/rfc2268.c
* lib/libgcrypt/cipher/rijndael-tables.h
* lib/libgcrypt/cipher/rijndael.c
* lib/libgcrypt/cipher/rmd.h
* lib/libgcrypt/cipher/rmd160.c
* lib/libgcrypt/cipher/rsa.c
* lib/libgcrypt/cipher/seed.c
* lib/libgcrypt/cipher/serpent.c
* lib/libgcrypt/cipher/sha1.c
* lib/libgcrypt/cipher/sha256.c
* lib/libgcrypt/cipher/sha512.c
* lib/libgcrypt/cipher/tiger.c
* lib/libgcrypt/cipher/twofish.c
* lib/libgcrypt/cipher/whirlpool.c
2009-11-17 11:03:00 +00:00
Felix Zielcke
814f5e9698
Use real function name in ChangeLog entry for r1837
2009-11-16 19:54:23 +01:00
Robert Millan
af2f93ac47
2009-11-16 Robert Millan <rmh.grub@aybabtu.com>
...
Fix build for systems without error().
* gnulib/error.c: New file (imported from Gnulib).
* gnulib/error.h: Likewise.
* conf/common.rmk (grub_mkisofs_SOURCES): Add `gnulib/error.c'.
* util/mkisofs/mkisofs.c (program_name): Remove `static' qualifier
(this variable is now used by error()).
2009-11-16 18:49:44 +00:00
Felix Zielcke
73fb3dd5f0
2009-11-16 Felix Zielcke <fzielcke@z-51.de>
...
* util/mkisofs/name.c (FDECL3): Use isascii macro instead of
relying that char is signed.
2009-11-16 19:47:10 +01:00
Vladimir 'phcoder' Serbinenko
a691ca3348
2009-11-16 Vladimir Serbinenko <phcoder@gmail.com>
...
* fs/i386/pc/pxe.c (grub_pxefs_open): Correctly handle PXE choosing
blocksize different from specified.
(grub_pxefs_read): Likewise.
2009-11-16 19:13:02 +01:00
Felix Zielcke
2af8f0f4fc
2009-11-16 Felix Zielcke <fzielcke@z-51.de>
...
Enable ata.mod on x86_64-efi, i386-efi and i386-ieee1275.
* disk/ata.c (grub_ata_dumpinfo): Add a cast.
(grub_ata_readwrite): Likewise. Update 2 format strings.
(grub_atapi_read): Likewise.
* conf/i386-coreboot.rmk (pkglib_MODULES): Move `ata.mod' from here ...
* conf/i386.rmk (pkglib_MODULES): ... to here ...
* conf/x86_64-efi.rmk (pkglib_MODULES): ... and here.
* conf/i386-coreboot.rmk (ata_mod_SOURCES, ata_mod_CFLAGS)
(ata_mod_LDFLAGS): Move from here ...
* conf/i386.rmk: ... to here ...
* conf/x86_64-efi.rmk: ... and here.
* conf/i386-pc.rmk (pkglib_MODULES): Remove `ata.mod'
(ata_mod_SOURCES, ata_mod_CFLAGS, ata_mod_LDFLAGS): Remove.
2009-11-16 16:01:15 +01:00
Robert Millan
83bdecaf2a
2009-11-16 Robert Millan <rmh.grub@aybabtu.com>
...
Relicense multiboot.h, with RMS' blessing.
* include/multiboot.h: Change to X11 license.
2009-11-15 23:22:45 +00:00
Robert Millan
fd6fd3d770
2009-11-15 Robert Millan <rmh.grub@aybabtu.com>
...
Support --version in grub-mkisofs.
* util/mkisofs/mkisofs.c (rcsid): Remove variable.
(OPTION_VERSION): New macro.
(ld_options): Recognize --version.
(usage): Move `program_name' from here ...
(program_name): ... to here. Add `static' qualifier.
(main): Recognize `OPTION_VERSION'.
2009-11-15 14:02:33 +00:00
Felix Zielcke
16a88c491c
2009-11-15 Felix Zielcke <fzielcke@z-51.de>
...
* Makefile.in (TARGET_CPPFLAGS): Replace `-isystem=$(srcdir)/include'
with `-nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include)'.
2009-11-15 13:41:25 +01:00
Robert Millan
a415847694
2009-11-14 Robert Millan <rmh.grub@aybabtu.com>
...
Fix help2man generation for mkisofs.
* util/mkisofs/mkisofs.c (ld_options): Recognize --help.
(usage): Send output to stdout (rather than stderr).
2009-11-14 21:20:02 +00:00
Robert Millan
fc2208b0ef
2009-11-14 Robert Millan <rmh.grub@aybabtu.com>
...
* conf/i386-coreboot.rmk (grub_mkrescue_SOURCES): Replace
`util/i386/coreboot/grub-mkrescue.in' with `util/grub-mkrescue.in'.
* conf/i386-pc.rmk (grub_mkrescue_SOURCES): Replace
`util/i386/pc/grub-mkrescue.in' with `util/grub-mkrescue.in'.
(bin_SCRIPTS): Add `grub-mkfloppy'.
(grub_mkfloppy_SOURCES): New variable.
* util/grub-mkrescue.in: New file.
* util/i386/pc/grub-mkfloppy.in: New file.
* util/i386/coreboot/grub-mkrescue.in: Remove.
* util/i386/pc/grub-mkrescue.in: Remove.
2009-11-14 18:38:11 +00:00
Robert Millan
8d0edf4abd
2009-11-13 Robert Millan <rmh.grub@aybabtu.com>
...
* include/grub/multiboot.h (struct grub_multiboot_header): Move
from here ...
* include/multiboot.h (struct multiboot_header): ... to here. Update
all users.
* include/grub/multiboot.h (struct grub_multiboot_info): Move
from here ...
* include/multiboot.h (struct multiboot_info): ... to here. Update
all users.
* include/grub/multiboot.h (struct grub_multiboot_mmap_entry): Move
from here ...
* include/multiboot.h (struct multiboot_mmap_entry): ... to here.
Update all users.
* include/grub/multiboot.h (struct grub_mod_list): Move
from here ...
* include/multiboot.h (struct multiboot_mod_list): ... to here.
Update all users.
2009-11-13 13:34:51 +00:00
Robert Millan
a73f596946
Forgot to commit ChangeLog ...
2009-11-13 13:32:22 +00:00
Robert Millan
1c8927f083
2009-11-13 Robert Millan <rmh.grub@aybabtu.com>
...
Disable Multiboot2 in i386-ieee1275. It didn't actually work, and on
this platform we should support Multiboot1 first.
* conf/i386-ieee1275.rmk (pkglib_MODULES): Remove `multiboot.mod'.
(multiboot_mod_SOURCES, multiboot_mod_CFLAGS)
(multiboot_mod_LDFLAGS, multiboot_mod_ASFLAGS): Remove.
2009-11-13 13:03:47 +00:00
Robert Millan
6e1e0d8954
2009-11-12 Robert Millan <rmh.grub@aybabtu.com>
...
* util/mkisofs/eltorito.c (init_boot_catalog): Handle return code
of write calls (converting them to fwrite() if they aren't already).
(get_torito_desc): Likewise.
* util/mkisofs/rock.c (generate_rock_ridge_attributes): Likewise.
2009-11-12 21:32:47 +00:00
Robert Millan
7f2b34d84e
2009-11-12 Robert Millan <rmh.grub@aybabtu.com>
...
* util/i386/pc/grub-install.in: Move from here ...
* util/grub-install.in: ... to here. Update all users.
2009-11-12 12:23:11 +00:00