]> git.proxmox.com Git - grub2.git/log
grub2.git
14 years agomerge mainline into lbafix
Vladimir 'phcoder' Serbinenko [Fri, 27 Nov 2009 11:56:26 +0000 (12:56 +0100)]
merge mainline into lbafix

14 years ago2009-11-26 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Thu, 26 Nov 2009 00:45:53 +0000 (00:45 +0000)]
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.

14 years ago2009-11-26 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Thu, 26 Nov 2009 00:08:42 +0000 (01:08 +0100)]
2009-11-26  Felix Zielcke  <fzielcke@z-51.de>

* conf/any-emu.rmk (grub_emu_SOURCES): Add `gnulib/progname.c'.

14 years ago2009-11-26 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Wed, 25 Nov 2009 23:52:55 +0000 (00:52 +0100)]
2009-11-26  Felix Zielcke  <fzielcke@z-51.de>

* conf/any-emu.rmk (grub_mkfont_SOURCES): Add `gnulib/progname.c'.

14 years ago2009-11-26 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Wed, 25 Nov 2009 23:10:02 +0000 (23:10 +0000)]
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'.

14 years ago2009-11-25 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Wed, 25 Nov 2009 18:13:35 +0000 (19:13 +0100)]
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.

14 years ago2009-11-25 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Wed, 25 Nov 2009 17:37:04 +0000 (18:37 +0100)]
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.

14 years ago2009-11-25 Yves Blusseau <yves.blusseau@zetam.org>
Yves Blusseau [Wed, 25 Nov 2009 11:23:16 +0000 (12:23 +0100)]
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.

14 years ago2009-11-25 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Wed, 25 Nov 2009 03:48:33 +0000 (03:48 +0000)]
2009-11-25  Robert Millan  <rmh.grub@aybabtu.com>

        * normal/main.c (grub_normal_read_line): Fix off-by-one
        buffer overflow..

14 years ago2009-11-25 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Wed, 25 Nov 2009 01:50:33 +0000 (01:50 +0000)]
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.

14 years ago2009-11-24 Carles Pina i Estany <carles@pina.cat>
Carles Pina i Estany [Tue, 24 Nov 2009 21:42:14 +0000 (21:42 +0000)]
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.

14 years ago2009-11-24 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Tue, 24 Nov 2009 20:01:40 +0000 (21:01 +0100)]
2009-11-24  Felix Zielcke  <fzielcke@z-51.de>

* util/Makefile.in (install-local): Convert a `for' into a normal
shell expansion.

14 years ago2009-11-24 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Tue, 24 Nov 2009 18:51:35 +0000 (18:51 +0000)]
2009-11-24  Robert Millan  <rmh.grub@aybabtu.com>

        * autogen.sh: Add automake call.
        * config.guess: Remove.
        * config.sub: Likewise.
        * install-sh: Likewise.

14 years ago2009-11-24 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Tue, 24 Nov 2009 18:44:24 +0000 (19:44 +0100)]
2009-11-24  Felix Zielcke  <fzielcke@z-51.de>

* util/Makefile.in (install-local): Fix the use of $lang shell variable.

14 years ago2009-11-24 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Tue, 24 Nov 2009 17:43:46 +0000 (18:43 +0100)]
2009-11-24  Felix Zielcke  <fzielcke@z-51.de>

* util/Makefile.in (install-local): Convert a make `$(foreach)'
function to a normal shell `for'.

14 years ago2009-11-24 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Tue, 24 Nov 2009 14:47:48 +0000 (15:47 +0100)]
2009-11-24  Felix Zielcke  <fzielcke@z-51.de>

* conf/i386-coreboot.rmk (grub_mkimage_SOURCES): Add `gnulib/progname.c'.

14 years ago2009-11-24 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Tue, 24 Nov 2009 14:00:25 +0000 (15:00 +0100)]
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.

14 years ago2009-11-24 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Tue, 24 Nov 2009 11:29:17 +0000 (12:29 +0100)]
2009-11-24  Felix Zielcke  <fzielcke@z-51.de>

* Makefile.in: Don't include GRUB_CONTRIB makefiles with emu
platform.

14 years ago2009-11-24 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Tue, 24 Nov 2009 10:49:49 +0000 (10:49 +0000)]
2009-11-24  Robert Millan  <rmh.grub@aybabtu.com>

        * zh_CN.po: New file.
        * LINGUAS: Add `zh_CN'.

14 years agoMove ChangeLog entries affecting po/ directory to po/ChangeLog
Robert Millan [Tue, 24 Nov 2009 10:45:26 +0000 (10:45 +0000)]
Move ChangeLog entries affecting po/ directory to po/ChangeLog

14 years ago2009-11-24 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Tue, 24 Nov 2009 08:55:28 +0000 (09:55 +0100)]
2009-11-24  Felix Zielcke  <fzielcke@z-51.de>

* util/getroot.c (grub_util_get_dev_abstraction): Properly use
strncmp().

14 years ago2009-11-24 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Tue, 24 Nov 2009 07:20:48 +0000 (08:20 +0100)]
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.

14 years ago2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Mon, 23 Nov 2009 22:41:37 +0000 (22:41 +0000)]
2009-11-23  Robert Millan  <rmh.grub@aybabtu.com>

        * po/id.po: New file.
        * LINGUAS: Add `id'.

14 years ago* Fixes date in the ChangeLog entry
Carles Pina i Estany [Mon, 23 Nov 2009 21:29:39 +0000 (21:29 +0000)]
* Fixes date in the ChangeLog entry

14 years ago2009-11-22 Carles Pina i Estany <carles@pina.cat>
Carles Pina i Estany [Mon, 23 Nov 2009 21:14:30 +0000 (21:14 +0000)]
2009-11-22  Carles Pina i Estany <carles@pina.cat>

* conf/common.rmk: Add grub-gettext_lib target and updates
  lib_DATA and CLEANFILES. Adds gettext.mod SOURCES, CFLAGS,
  LDFLAGS.
* gettext/gettext.c: New file. (Reads mo files).
* include/grub/file.h (grub_file_pread): New prototype.
* include/grub/i18n.h (_): New prototype.
* include/grub/misc.h (grub_gettext_dummy, grub_gettext): New
  prototypes.
* kern/misc.c (grub_gettext_dummy): New function.
* normal/menu_text.c: Include <grub/i18n.h>.
* normal/menu_text.c (print_timeout): Gettexttize string.
* normal/menu_text.c (print_message): Gettexttize string.
* po/POTFILES: Add `normal/menu_text.c'.
* po/ca.po: Add new translations.
* util/grub.d/00_header.in: Define locale_dir and lang. insmod
  gettext module and defines locale_dir and lang in grub.cfg.
* NEWS: Add gettext support.

14 years agoFinal touches before merging
Carles Pina i Estany [Mon, 23 Nov 2009 20:59:24 +0000 (20:59 +0000)]
Final touches before merging

14 years agoSyncs with trunk
Carles Pina i Estany [Mon, 23 Nov 2009 20:50:01 +0000 (20:50 +0000)]
Syncs with trunk

14 years agoAdds gettext note in NEWS.
Carles Pina i Estany [Mon, 23 Nov 2009 20:47:25 +0000 (20:47 +0000)]
Adds gettext note in NEWS.

14 years agoMerging with trunk
Carles Pina i Estany [Mon, 23 Nov 2009 20:34:42 +0000 (20:34 +0000)]
Merging with trunk

14 years agoCleaning up
Carles Pina i Estany [Mon, 23 Nov 2009 20:31:57 +0000 (20:31 +0000)]
Cleaning up

14 years ago2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Mon, 23 Nov 2009 20:30:56 +0000 (20:30 +0000)]
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.

14 years agoUncommits the last commits (to make the new merge with trunk easier)
Carles Pina i Estany [Mon, 23 Nov 2009 20:22:36 +0000 (20:22 +0000)]
Uncommits the last commits (to make the new merge with trunk easier)

14 years ago2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Mon, 23 Nov 2009 15:37:33 +0000 (15:37 +0000)]
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.

14 years agoCheery-pick grub-emu split from experimental (rev 1361)
Robert Millan [Mon, 23 Nov 2009 15:31:54 +0000 (15:31 +0000)]
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.

14 years ago2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Mon, 23 Nov 2009 15:23:55 +0000 (15:23 +0000)]
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".

14 years agoResync.
Robert Millan [Mon, 23 Nov 2009 15:19:43 +0000 (15:19 +0000)]
Resync.

14 years ago2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Mon, 23 Nov 2009 13:18:07 +0000 (13:18 +0000)]
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.

14 years agoAdd auto-generated gcrypt files.
Robert Millan [Mon, 23 Nov 2009 12:18:37 +0000 (12:18 +0000)]
Add auto-generated gcrypt files.

14 years ago2009-11-23 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Mon, 23 Nov 2009 11:17:50 +0000 (11:17 +0000)]
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.

14 years ago2009-11-22 Carles Pina i Estany <carles@pina.cat>
Carles Pina i Estany [Sun, 22 Nov 2009 23:41:06 +0000 (23:41 +0000)]
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.

14 years ago2009-11-22 Carles Pina i Estany <carles@pina.cat>
Carles Pina i Estany [Sun, 22 Nov 2009 22:24:54 +0000 (22:24 +0000)]
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.

14 years agomerging to trunk...
Carles Pina i Estany [Sun, 22 Nov 2009 21:45:40 +0000 (21:45 +0000)]
merging to trunk...

14 years agoRemoves the non-gettext string
Carles Pina i Estany [Sun, 22 Nov 2009 21:42:28 +0000 (21:42 +0000)]
Removes the non-gettext string

14 years agoFinal touches (don't gettextize a string, chang setted by set)
Carles Pina i Estany [Sun, 22 Nov 2009 21:41:33 +0000 (21:41 +0000)]
Final touches (don't gettextize a string, chang setted by set)

14 years agoSome more changes...
Carles Pina i Estany [Sun, 22 Nov 2009 18:58:19 +0000 (18:58 +0000)]
Some more changes...

14 years agoChanges catalan strings like it was before (test)
Carles Pina i Estany [Sun, 22 Nov 2009 16:59:20 +0000 (16:59 +0000)]
Changes catalan strings like it was before (test)

14 years agoRemoves a debug variable (new_fd)
Carles Pina i Estany [Sun, 22 Nov 2009 16:57:17 +0000 (16:57 +0000)]
Removes a debug variable (new_fd)

14 years agoCorrects Catalan translation
Carles Pina i Estany [Sun, 22 Nov 2009 13:01:49 +0000 (13:01 +0000)]
Corrects Catalan translation

14 years agoThis commit is the same than gettext08.patch (see mailing list)
Carles Pina i Estany [Sun, 22 Nov 2009 12:50:46 +0000 (12:50 +0000)]
This commit is the same than gettext08.patch (see mailing list)

14 years agoSync with trunk
Carles Pina i Estany [Sun, 22 Nov 2009 11:56:10 +0000 (11:56 +0000)]
Sync with trunk

14 years agoDifferent changes following Robert's email 20091121230904.GA29740@thorin
Carles Pina i Estany [Sun, 22 Nov 2009 11:49:54 +0000 (11:49 +0000)]
Different changes following Robert's email 20091121230904.GA29740@thorin

14 years ago2009-11-22 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Sun, 22 Nov 2009 10:20:14 +0000 (10:20 +0000)]
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.

14 years agoSome comments following Grub standard of code.
Carles Pina i Estany [Sat, 21 Nov 2009 23:11:14 +0000 (23:11 +0000)]
Some comments following Grub standard of code.

14 years agoMoves where pkglib_MODULS += gettext.mod is defined
Carles Pina i Estany [Sat, 21 Nov 2009 23:06:37 +0000 (23:06 +0000)]
Moves where pkglib_MODULS += gettext.mod is defined

14 years agoMerge remote
Felix Zielcke [Sat, 21 Nov 2009 22:25:20 +0000 (23:25 +0100)]
Merge remote

14 years ago2009-11-21 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Sat, 21 Nov 2009 22:23:35 +0000 (23:23 +0100)]
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.

14 years agoAdds the ChangeLog.gettext file
Carles Pina i Estany [Sat, 21 Nov 2009 22:19:16 +0000 (22:19 +0000)]
Adds the ChangeLog.gettext file

14 years agoDeletes grub-gettext_lib.in (not needed after Robert's changes)
Carles Pina i Estany [Sat, 21 Nov 2009 21:18:12 +0000 (21:18 +0000)]
Deletes grub-gettext_lib.in (not needed after Robert's changes)

14 years agomerge with Trunk
Carles Pina i Estany [Sat, 21 Nov 2009 21:05:15 +0000 (21:05 +0000)]
merge with Trunk

14 years ago2009-11-21 Samuel Thibault <samuel.thibault@ens-lyon.org>
Samuel Thibault [Sat, 21 Nov 2009 17:00:23 +0000 (18:00 +0100)]
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.

14 years ago2009-11-21 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Sat, 21 Nov 2009 16:40:55 +0000 (17:40 +0100)]
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.

14 years agoMerge trunk
Felix Zielcke [Sat, 21 Nov 2009 14:49:21 +0000 (15:49 +0100)]
Merge trunk

14 years ago2009-11-21 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Sat, 21 Nov 2009 14:41:46 +0000 (15:41 +0100)]
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.

14 years ago2009-11-21 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Sat, 21 Nov 2009 13:48:15 +0000 (13:48 +0000)]
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.

14 years ago2009-11-21 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Sat, 21 Nov 2009 13:22:41 +0000 (13:22 +0000)]
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.

14 years ago2009-11-21 Carles Pina i Estany <carles@pina.cat>
Robert Millan [Sat, 21 Nov 2009 13:11:38 +0000 (13:11 +0000)]
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.

14 years ago2009-11-20 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Fri, 20 Nov 2009 21:39:07 +0000 (22:39 +0100)]
2009-11-20  Felix Zielcke  <fzielcke@z-51.de>

* configure.ac (UNIFONT_BDF): Rename to ...
(FONT_SOURCE): ... this.  Update all users.

14 years agoRevert accidently renaming of UNIFONT_BDF in configure.ac
Felix Zielcke [Fri, 20 Nov 2009 20:13:50 +0000 (21:13 +0100)]
Revert accidently renaming of UNIFONT_BDF in configure.ac

14 years ago2009-11-20 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Fri, 20 Nov 2009 20:08:29 +0000 (21:08 +0100)]
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.

14 years ago2009-11-19 Carles Pina i Estany <carles@pina.cat>
Carles Pina i Estany [Thu, 19 Nov 2009 21:43:09 +0000 (21:43 +0000)]
2009-11-19  Carles Pina i Estany <carles@pina.cat>

* include/grb/i18n_grub.h: same than i18n.h but for Grub Kernel.
* include/grub/misc.h: includes i18n_grub.h.
* normal/menu_text.c: gettize more strings.
* po/POTFILES: Update with new file.
* po/ca.po: New strings.

14 years agoSyncs with trunk
Carles Pina i Estany [Thu, 19 Nov 2009 21:18:38 +0000 (21:18 +0000)]
Syncs with trunk

14 years ago2009-11-19 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Thu, 19 Nov 2009 10:39:14 +0000 (10:39 +0000)]
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().

14 years ago2009-11-19 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Thu, 19 Nov 2009 09:07:35 +0000 (10:07 +0100)]
2009-11-19  Felix Zielcke  <fzielcke@z-51.de>

* Makefile.in (install-local): Add a missing backslash.

14 years ago2009-11-19 Felix Zielcke <fzielcke@z-51.de>
Felix Zielcke [Thu, 19 Nov 2009 08:33:56 +0000 (09:33 +0100)]
2009-11-19  Felix Zielcke  <fzielcke@z-51.de>

* include/grub/x86_64/io.h: New file.

14 years ago2009-11-19 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Wed, 18 Nov 2009 23:20:22 +0000 (23:20 +0000)]
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'.

14 years agoDocument util/mkisofs/mkisofs.h change properly in previous ChangeLog entry ...
Robert Millan [Wed, 18 Nov 2009 23:11:03 +0000 (23:11 +0000)]
Document util/mkisofs/mkisofs.h change properly in previous ChangeLog entry ...

14 years agoForgot to commit ChangeLog...
Robert Millan [Wed, 18 Nov 2009 23:07:24 +0000 (23:07 +0000)]
Forgot to commit ChangeLog...

14 years ago2009-11-19 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Wed, 18 Nov 2009 23:05:59 +0000 (23:05 +0000)]
2009-11-19  Robert Millan  <rmh.grub@aybabtu.com>

        * conf/common.rmk (grub_mkisofs_SOURCES): Add `gnulib/progname.c'.
        * util/mkisofs/mkisofs.c: Include `"progname.h"'.
        (program_name): Remove.
        (main): Initialize gettext support.

        * util/mkisofs/eltorito.c: Gettexttize.
        * util/mkisofs/joliet.c: Likewise.
        * util/mkisofs/mkisofs.c: Likewise.
        * util/mkisofs/mkisofs.h: Likewise.
        * util/mkisofs/multi.c: Likewise.
        * util/mkisofs/rock.c: Likewise.
        * util/mkisofs/tree.c: Likewise.
        * util/mkisofs/write.c: Likewise.

        * po/POTFILES: Update with new files.

14 years ago2009-11-18 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Wed, 18 Nov 2009 22:59:40 +0000 (22:59 +0000)]
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.

14 years ago2009-11-18 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Wed, 18 Nov 2009 22:49:59 +0000 (22:49 +0000)]
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.

14 years ago2009-11-18 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Wed, 18 Nov 2009 21:03:09 +0000 (21:03 +0000)]
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.

14 years ago2009-11-18 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Wed, 18 Nov 2009 20:57:57 +0000 (20:57 +0000)]
2009-11-18  Robert Millan  <rmh.grub@aybabtu.com>

        * Makefile.in ($(srcdir)/aclocal.m4): New target.

14 years agoMerge my gettext branch (gettext support in build system for GRUB utilities)
Robert Millan [Tue, 17 Nov 2009 20:23:06 +0000 (20:23 +0000)]
Merge my gettext branch (gettext support in build system for GRUB utilities)

14 years agoComplete ChangeLog.
Robert Millan [Tue, 17 Nov 2009 11:55:04 +0000 (11:55 +0000)]
Complete ChangeLog.

14 years ago2009-11-17 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Tue, 17 Nov 2009 11:44:43 +0000 (11:44 +0000)]
2009-11-17  Robert Millan  <rmh.grub@aybabtu.com>

        * INSTALL: Document Automake is needed for bootstrap.
        * po/ca.po: Fix PO-Revision-Date and Language-Team fields.
        * util/grub.d/10_kfreebsd.in (bindir): New variable.
        Add gettext initialization.
        (kfreebsd_entry): Make menuentry output translatable.

14 years agoUse proper path for gettext.sh and export TEXTDOMAINDIR.
Robert Millan [Tue, 17 Nov 2009 11:32:05 +0000 (11:32 +0000)]
Use proper path for gettext.sh and export TEXTDOMAINDIR.

14 years ago2009-11-17 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Tue, 17 Nov 2009 11:20:39 +0000 (11:20 +0000)]
2009-11-17  Robert Millan  <rmh.grub@aybabtu.com>

        * Makefile.in (XGETTEXT, MSGMERGE, MSGFMT, LINGUAS): New variables.
        (po/$(PACKAGE).pot): Replace `xgettext' with `$(XGETTEXT)'.
        (po/*.po): Replace `msgmerge' with `$(MSGMERGE)'.
        (po/%.mo): Replace `msgfmt' with `$(MSGFMT)'.
        * po/LINGUAS: New file.

14 years agoMerge libgcrypt branch.
Robert Millan [Tue, 17 Nov 2009 11:03:00 +0000 (11:03 +0000)]
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

14 years ago* INSTALL: Document that Python is required for bootstrap.
Robert Millan [Tue, 17 Nov 2009 10:57:26 +0000 (10:57 +0000)]
* INSTALL: Document that Python is required for bootstrap.

14 years ago2009-11-17 Robert Millan <rmh.grub@aybabtu.com>
Robert Millan [Tue, 17 Nov 2009 10:47:22 +0000 (10:47 +0000)]
2009-11-17  Robert Millan  <rmh.grub@aybabtu.com>

        * configure.ac: Call AM_GNU_GETTEXT() (defines localedir, among
        other things).
        * Makefile.in (CPPFLAGS): Add `-DLOCALEDIR=\"$(localedir)\"'.
        * util/i386/pc/grub-mkimage.c (main): Issue setlocale() and
        bindtextdomain() calls for gettext initialization.

14 years agoReorganize.
Robert Millan [Tue, 17 Nov 2009 10:43:26 +0000 (10:43 +0000)]
Reorganize.

14 years ago * gnulib/progname.c: New file (imported from Gnulib).
Robert Millan [Tue, 17 Nov 2009 10:40:43 +0000 (10:40 +0000)]
    * gnulib/progname.c: New file (imported from Gnulib).
        * gnulib/progname.h: Likewise.
        * conf/i386-pc.rmk (grub_mkimage_SOURCES): Add `gnulib/progname.c'.
        * util/i386/pc/grub-mkimage.c: Include `"progname.h"'.
        (usage): Replace `progname' with `program_name'.
        (main): Use set_program_name() for program name initialization.

14 years ago * conf/common.rmk (grub_mkisofs_CFLAGS): Move `-I$(srcdir)/gnulib'
Robert Millan [Tue, 17 Nov 2009 10:31:08 +0000 (10:31 +0000)]
    * conf/common.rmk (grub_mkisofs_CFLAGS): Move `-I$(srcdir)/gnulib'
        from here ...
        * Makefile.in (CPPFLAGS): ... to here.

14 years agoAdd ChangeLog entries.
Robert Millan [Tue, 17 Nov 2009 10:27:29 +0000 (10:27 +0000)]
Add ChangeLog entries.

14 years agoIntegrate import_gcry.py in autogen.sh.
Robert Millan [Tue, 17 Nov 2009 10:22:54 +0000 (10:22 +0000)]
Integrate import_gcry.py in autogen.sh.

14 years agoMerge import_gcry.py from Vladimir's crypto branch.
Robert Millan [Tue, 17 Nov 2009 10:21:01 +0000 (10:21 +0000)]
Merge import_gcry.py from Vladimir's crypto branch.

14 years agoMove i18n declarations to their own file.
Robert Millan [Tue, 17 Nov 2009 09:52:08 +0000 (09:52 +0000)]
Move i18n declarations to their own file.

14 years agoImport ciphers from libgcrypt 1.4.4.
Robert Millan [Mon, 16 Nov 2009 20:59:10 +0000 (20:59 +0000)]
Import ciphers from libgcrypt 1.4.4.

14 years agoGettextify.
Robert Millan [Mon, 16 Nov 2009 20:19:42 +0000 (20:19 +0000)]
Gettextify.

14 years agoAdd aclocal.m4, po/*.mo and po/grub.pot.
Robert Millan [Mon, 16 Nov 2009 20:12:53 +0000 (20:12 +0000)]
Add aclocal.m4, po/*.mo and po/grub.pot.