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
Carles Pina i Estany
e2c37719a6
Uncommits the last commits (to make the new merge with trunk easier)
2009-11-23 20:22:36 +00:00
Vladimir 'phcoder' Serbinenko
4996893238
definition fixes
2009-11-23 21:15:44 +01:00
Vladimir 'phcoder' Serbinenko
8eea9034f8
Use LOCAL in relocator
2009-11-23 20:18:10 +01: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
26743e871b
Resync.
2009-11-23 15:19:43 +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
57082942dd
Add auto-generated gcrypt files.
2009-11-23 12:18:37 +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
Vladimir 'phcoder' Serbinenko
5acc2aba78
merged mainline into PCI
2009-11-23 11:15:24 +01:00
Vladimir 'phcoder' Serbinenko
d00e2a0b4c
Merge mainstream into mips
2009-11-23 11:07:31 +01:00
Carles Pina i Estany
9874f05759
2009-11-22 Carles Pina i Estany <carles@pina.cat>
...
* normal/menu_text.c (get_spaces): New function.
(print_timeout): Gettextize, add spaces to the localized string.
2009-11-22 23:41:06 +00:00
Vladimir 'phcoder' Serbinenko
1c805a5a3e
Fixed cache invalidating
2009-11-23 00:16:49 +01:00
Carles Pina i Estany
4d1f668fd9
2009-11-22 Carles Pina i Estany <carles@pina.cat>
...
* normal/menu_text.c: Gettexttize but not print_timeout function.
* normal/main.c: Gettexttize.
* normal/menu_entry.c: Likewise.
2009-11-22 22:24:54 +00:00
Carles Pina i Estany
4baf87d9e4
merging to trunk...
2009-11-22 21:45:40 +00:00
Carles Pina i Estany
347687cf6e
Removes the non-gettext string
2009-11-22 21:42:28 +00:00
Carles Pina i Estany
6e2621b9ff
Final touches (don't gettextize a string, chang setted by set)
2009-11-22 21:41:33 +00:00
Carles Pina i Estany
b6c871b0d7
Some more changes...
2009-11-22 18:58:19 +00:00
Carles Pina i Estany
3014405923
Changes catalan strings like it was before (test)
2009-11-22 16:59:20 +00:00
Carles Pina i Estany
c505aa627f
Removes a debug variable (new_fd)
2009-11-22 16:57:17 +00:00
Vladimir 'phcoder' Serbinenko
8719095cc8
Hopefully fixed cache problems in relocator
2009-11-22 15:05:20 +01:00
Carles Pina i Estany
938d89c04d
Corrects Catalan translation
2009-11-22 13:01:49 +00:00
Carles Pina i Estany
e5fb78c684
This commit is the same than gettext08.patch (see mailing list)
2009-11-22 12:50:46 +00:00
Vladimir 'phcoder' Serbinenko
937d332db3
compile and configuration fixes
2009-11-22 13:15:49 +01:00
Carles Pina i Estany
39eaee93f1
Sync with trunk
2009-11-22 11:56:10 +00:00
Carles Pina i Estany
0648f857ea
Different changes following Robert's email 20091121230904.GA29740@thorin
2009-11-22 11:49:54 +00:00
Vladimir 'phcoder' Serbinenko
7f4f3f581c
Unify grub-install.in for sparc64 with i386-ieee1275
2009-11-22 12:22:19 +01:00
Vladimir 'phcoder' Serbinenko
4fe6aa0961
synced with mainstream
2009-11-22 12:11:17 +01: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
Vladimir 'phcoder' Serbinenko
42810eb1a0
Improved cache handling
2009-11-22 02:56:49 +01:00
Vladimir 'phcoder' Serbinenko
6755a5c359
Fixed grub-mkimage source list
2009-11-22 02:55:07 +01:00
Vladimir 'phcoder' Serbinenko
befd7fb24a
Fixed path to grub-mkrawimage.c
2009-11-22 02:54:03 +01:00
Carles Pina i Estany
ee99edc809
Some comments following Grub standard of code.
2009-11-21 23:11:14 +00:00
Carles Pina i Estany
43fa69467c
Moves where pkglib_MODULS += gettext.mod is defined
2009-11-21 23:06:37 +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
Carles Pina i Estany
414092d75a
Adds the ChangeLog.gettext file
2009-11-21 22:19:16 +00:00
Robert Millan
d2be748185
2009-11-21 Robert Millan <rmh.grub@aybabtu.com>
...
* maintainance/gentrigtables.py: Remove.
* lib/trig.c: Likewise.
* gentrigtables.c: New file. C rewrite of gentrigtables.py.
* conf/common.rmk (trig_mod_SOURCES): Replace `lib/trig.c' with
`trigtables.c'.
(trigtables.c): New rule.
(gentrigtables): Likewise.
(DISTCLEANFILES): Add `trigtables.c' and `gentrigtables'.
2009-11-21 21:44:08 +00:00
Carles Pina i Estany
cb681ffd7a
Deletes grub-gettext_lib.in (not needed after Robert's changes)
2009-11-21 21:18:12 +00:00
Carles Pina i Estany
a239a5e9cc
merge with Trunk
2009-11-21 21:05:15 +00:00
Robert Millan
f5b23252e2
2009-11-21 Robert Millan <rmh.grub@aybabtu.com>
...
* maintainance/gentrigtables.py: Avoid duplicate hardcoding of
integer constants.
2009-11-21 20:59:48 +00:00
Vladimir 'phcoder' Serbinenko
5afcd00788
merge mainstream into mips
2009-11-21 21:45:32 +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
Vladimir 'phcoder' Serbinenko
87efa251d5
Fix a bug in icondir handling
2009-11-21 17:48:05 +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
Vladimir 'phcoder' Serbinenko
6abdf8e20d
Fix for native miscompilation
2009-11-21 17:33:52 +01:00
Vladimir 'phcoder' Serbinenko
ade85305f8
recognise mips64(el) targets
2009-11-21 17:33:23 +01:00
Felix Zielcke
97951fb232
Merge trunk
2009-11-21 15:49:21 +01:00