From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 22 Dec 2009 13:28:39 +0000 (+0100)
Subject: merge mainline into crypto
X-Git-Tag: 1.98~212^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba136b293ac4cfbd2264e97d6de899808854e9b4;p=thirdparty%2Fgrub.git

merge mainline into crypto
---

ba136b293ac4cfbd2264e97d6de899808854e9b4
diff --cc conf/common.rmk
index ad0e4942c,1ed30a404..81372d20c
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@@ -633,24 -639,7 +639,29 @@@ setjmp_mod_SOURCES = lib/$(target_cpu)/
  setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
  setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
+ pkglib_MODULES += charset.mod
+ charset_mod_SOURCES = lib/charset.c
+ charset_mod_CFLAGS = $(COMMON_CFLAGS)
+ charset_mod_LDFLAGS = $(COMMON_LDFLAGS)
++
 +pkglib_MODULES += crypto.mod
 +crypto_mod_SOURCES = lib/crypto.c
 +crypto_mod_CFLAGS = $(COMMON_CFLAGS)
 +crypto_mod_LDFLAGS = $(COMMON_LDFLAGS)
 +
 +pkglib_MODULES += pbkdf2.mod
 +pbkdf2_mod_SOURCES = lib/pbkdf2.c
 +pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
 +pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 +
 +# For password_pbkdf2.mod.
 +pkglib_MODULES += password_pbkdf2.mod
 +password_pbkdf2_mod_SOURCES = commands/password_pbkdf2.c
 +password_pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
 +password_pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 +
 +bin_UTILITIES += grub-mkpasswd-pbkdf2
 +grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/err.c
 +grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap -DGRUB_MKPASSWD=1
 +
 +include $(srcdir)/conf/gcry.mk