Commit graph

2472 commits

Author SHA1 Message Date
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
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
Vladimir 'phcoder' Serbinenko
e4eff4ed62 changed leftover 32 to XX 2009-11-20 23:37:33 +01: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
68b44b1d2d Revert accidently renaming of UNIFONT_BDF in configure.ac 2009-11-20 21:13:50 +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
Vladimir 'phcoder' Serbinenko
d3d0094e17 ChangeLog 2009-11-20 13:29:17 +01:00
Vladimir 'phcoder' Serbinenko
6e3ac95491 Fixed warning 2009-11-20 13:23:43 +01:00
Colin Watson
242f0731c7 reimported savedefault by cjwatson and myself
Also-By: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
2009-11-20 09:41:20 +01:00
Vladimir 'phcoder' Serbinenko
f78821e5bc Removed extraneous copyright line 2009-11-19 23:10:40 +01:00
Carles Pina i Estany
44883dfbd5 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.
2009-11-19 21:43:09 +00:00
Carles Pina i Estany
fbc5e89710 Syncs with trunk 2009-11-19 21:18:38 +00: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
700d59cded 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.
2009-11-18 23:05:59 +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
Vladimir 'phcoder' Serbinenko
024478a2d8 Fixed bug which causes some commands to be masked 2009-11-18 18:54:23 +01: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
16a9760933 Complete ChangeLog. 2009-11-17 11:55:04 +00:00
Robert Millan
37fb845ba6 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.
2009-11-17 11:44:43 +00:00
Robert Millan
5dd39a2f3b Use proper path for gettext.sh and export TEXTDOMAINDIR. 2009-11-17 11:32:05 +00:00
Robert Millan
8c37c91f99 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.
2009-11-17 11:20:39 +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
Robert Millan
8d20dcfc71 * INSTALL: Document that Python is required for bootstrap. 2009-11-17 10:57:26 +00:00
Robert Millan
336262f829 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.
2009-11-17 10:47:22 +00:00
Robert Millan
1608391625 Reorganize. 2009-11-17 10:43:26 +00:00
Robert Millan
548643e528 * 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.
2009-11-17 10:40:43 +00:00
Robert Millan
ab502ec59d * conf/common.rmk (grub_mkisofs_CFLAGS): Move `-I$(srcdir)/gnulib'
from here ...
        * Makefile.in (CPPFLAGS): ... to here.
2009-11-17 10:31:08 +00:00
Robert Millan
ca221b0770 Add ChangeLog entries. 2009-11-17 10:27:29 +00:00
Robert Millan
0ef45b9398 Integrate import_gcry.py in autogen.sh. 2009-11-17 10:22:54 +00:00
Robert Millan
59917f8496 Merge import_gcry.py from Vladimir's crypto branch. 2009-11-17 10:21:01 +00:00
Robert Millan
9a90f817a0 Move i18n declarations to their own file. 2009-11-17 09:52:08 +00:00
Robert Millan
bfaae3cdd4 Import ciphers from libgcrypt 1.4.4. 2009-11-16 20:59:10 +00:00
Robert Millan
a1085f18c5 Gettextify. 2009-11-16 20:19:42 +00:00
Robert Millan
5f4db17d00 Add aclocal.m4, po/*.mo and po/grub.pot. 2009-11-16 20:12:53 +00:00
Robert Millan
f5e9dadb58 Use PACKAGE instead of hardcoding "grub". 2009-11-16 20:03:14 +00:00