From: Robert Millan Date: Tue, 17 Nov 2009 20:23:06 +0000 (+0000) Subject: Merge my gettext branch (gettext support in build system for GRUB utilities) X-Git-Tag: 1.98~408 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=769ae37bfdcefebaf15f13c4ac1fac083d43f64a;p=thirdparty%2Fgrub.git Merge my gettext branch (gettext support in build system for GRUB utilities) --- 769ae37bfdcefebaf15f13c4ac1fac083d43f64a diff --cc ChangeLog index ac8bed734,b0958fc91..6d7a25be4 --- a/ChangeLog +++ b/ChangeLog @@@ -1,98 -1,3 +1,162 @@@ ++2009-11-17 Robert Millan ++ ++ * 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 Robert Millan ++ ++ * Makefile.in (XGETTEXT, MSGMERGE, MSGFMT): New variables. ++ (po/$(PACKAGE).pot): Replace `xgettext' with `$(XGETTEXT)'. ++ (po/*.po): Replace `msgmerge' with `$(MSGMERGE)'. ++ (po/%.mo): Replace `msgfmt' with `$(MSGFMT)'. ++ (LINGUAS): Auto-generate using `po/LINGUAS'. ++ * po/LINGUAS: New file. ++ ++2009-11-17 Robert Millan ++ ++ * 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 Robert Millan ++ ++ * 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 Robert Millan ++ ++ * conf/common.rmk (grub_mkisofs_CFLAGS): Move `-I$(srcdir)/gnulib' ++ from here ... ++ * Makefile.in (CPPFLAGS): ... to here. ++ ++2009-11-16 Robert Millan ++ ++ * 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 Robert Millan ++ ++ * Makefile.in (CLEANFILES): Add `po/*.mo'. ++ (LINGUAS): New variable. ++ (all-local): Add `$(foreach lang, $(LINGUAS), po/$(lang).mo)'. ++ (install-local): Install MO files. ++ (po/$(PACKAGE).pot, po/*.po, po/%.mo): New rules. ++ * include/grub/i18n.h: New file. ++ * po/POTFILES: New file. ++ * po/ca.po: New file. ++ * util/grub.d/10_linux.in (bindir): New variable. ++ Add gettext initialization. ++ (linux_entry): Make menuentry output translatable. ++ * util/i386/pc/grub-mkimage.c: Include `'. ++ (usage): Make --help output translatable. ++ (main): Initialize gettext. ++ +2009-11-17 Robert Millan + + * 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 + + 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-16 Robert Millan + + 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 Felix Zielcke + + * util/mkisofs/name.c (iso9660_file_length): Use isascii macro + instead of relying that char is signed. + +2009-11-16 Vladimir Serbinenko + + * fs/i386/pc/pxe.c (grub_pxefs_open): Correctly handle PXE choosing + blocksize different from specified. + (grub_pxefs_read): Likewise. + +2009-11-16 Felix Zielcke + + 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 Robert Millan + + Relicense multiboot.h, with RMS' blessing. + + * include/multiboot.h: Change to X11 license. + 2009-11-15 Robert Millan Support --version in grub-mkisofs. diff --cc INSTALL index d1d17d1b5,74bf3d490..e7f9e8936 --- a/INSTALL +++ b/INSTALL @@@ -21,8 -21,8 +21,9 @@@ If you use a development snapshot or wa need the following. * Ruby 1.6 or later +* Python 2.5.2 or later * Autoconf 2.59d or later + * Automake 1.10.1 or later Configuring the GRUB ==================== diff --cc autogen.sh index 94322b15e,8e5a29215..5cbdbb489 --- a/autogen.sh +++ b/autogen.sh @@@ -2,13 -2,10 +2,14 @@@ set -e + aclocal autoconf autoheader + echo timestamp > stamp-h.in + +python util/import_gcry.py lib/libgcrypt/ . + for rmk in conf/*.rmk ${GRUB_CONTRIB}/*/conf/*.rmk; do if test -e $rmk ; then ruby genmk.rb < $rmk > `echo $rmk | sed 's/\.rmk$/.mk/'` diff --cc conf/common.rmk index 54bec37b0,57b47a669..9888ab7e0 --- a/conf/common.rmk +++ b/conf/common.rmk @@@ -36,10 -36,9 +36,10 @@@ grub_mkisofs_SOURCES = util/mkisofs/elt util/mkisofs/rock.c util/mkisofs/tree.c \ util/mkisofs/write.c \ \ - gnulib/fnmatch.c gnulib/getopt1.c gnulib/getopt.c + gnulib/fnmatch.c gnulib/getopt1.c gnulib/getopt.c \ + gnulib/error.c grub_mkisofs_CFLAGS = -D_FILE_OFFSET_BITS=64 \ - -I$(srcdir)/util/mkisofs/include -I$(srcdir)/gnulib \ + -I$(srcdir)/util/mkisofs/include \ -Wno-all -Werror # For grub-fstest.