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
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
Robert Millan
49a38e7696
sed Makefile.in -e "s/messages.pot/\$(PACKAGE).pot/g" -i
2009-11-16 19:36:12 +00:00
Robert Millan
fc22844e83
2009-11-16 Robert Millan <rmh.grub@aybabtu.com>
...
* aclocal.m4: Move from here ...
* acinclude.m4: ... to here.
* autogen.sh: Add call to `aclocal'.
* configure.ac: Add AM_INIT_AUTOMAKE() after AC_INIT() call.
2009-11-16 19:31:29 +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
ed101e8122
Initial support for gettext in build system.
2009-11-15 23:11:01 +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
Vladimir 'phcoder' Serbinenko
6621b0e706
2009-11-14 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-14 22:08:07 +01: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
Carles Pina i Estany
203ffbfa31
Adds gettext support in Grub. Building system needs to be improved and maybe userland utilites improved.
...
YYYY-MM-DD Carles Pina i Estany <carles@pina.cat>
* Makefile.in: Add uptrans target to help to update .pot file
* conf/common.rmk: Add grub-gettext_lib target, dependency and SOURCES, CFLAGS, LDFLAGS
* kern/misc.c: Define grub_gettext symbol and add implement grub_gettext_dummy function
* po/TODO: Temporary file with instructions of what Makefile.in will do
* po/ca.po: Catalan translation stub
* include/grub/misc.h: Define macro _(char *s). Declare grub_gettext_dummy and grub_gettext
* gettext/gettext.c: New file with gettext implementation
* normal/menu.c (print_message): add _( ) to some strings
* util/grub.d/10_linux.in: include grub-gettext_lib file. For the Linux menuentry, call eval_gettext
* util/grub.d/00_header.in: add locale_prefix and gettext locale detection and setting up the access to the mo directory
* util/grub-mkconfig_lib.in: add get_locale_lang
* util/grub-gettext_lib.in: new file
2009-11-13 20:39:33 +00:00
Robert Millan
2e035eb9ba
Add .bzrignore
2009-11-13 17:32:22 +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
6944770e0c
2009-11-13 Robert Millan <rmh.grub@aybabtu.com>
...
* include/multiboot2.h (multiboot_word): Rename from this ...
(multiboot2_word): ... to this. Update all users.
(multiboot_header): Rename from this ...
(multiboot2_header): ... to this. Update all users.
(multiboot_tag_header): Rename from this ...
(multiboot2_tag_header): ... to this. Update all users.
(multiboot_tag_start): Rename from this ...
(multiboot2_tag_start): ... to this. Update all users.
(multiboot_tag_name): Rename from this ...
(multiboot2_tag_name): ... to this. Update all users.
(multiboot_tag_module): Rename from this ...
(multiboot2_tag_module): ... to this. Update all users.
(multiboot_tag_memory): Rename from this ...
(multiboot2_tag_memory): ... to this. Update all users.
(multiboot_tag_unused): Rename from this ...
(multiboot2_tag_unused): ... to this. Update all users.
(multiboot_tag_end): Rename from this ...
(multiboot2_tag_end): ... to this. Update all users.
2009-11-13 13:30:55 +00:00