From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 18 May 2010 11:19:42 +0000 (+0200)
Subject: merge mainline into newreloc
X-Git-Tag: 1.99~629^2~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13f58ea31f6b22c44486fd3a4beaabbfe5f889f4;p=thirdparty%2Fgrub.git

merge mainline into newreloc
---

13f58ea31f6b22c44486fd3a4beaabbfe5f889f4
diff --cc conf/common.rmk
index 29d69f27a,4186c61b2..04a2861a9
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@@ -860,14 -846,7 +846,14 @@@ boot_mod_CFLAGS = $(COMMON_CFLAGS
  boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
  bin_UTILITIES += grub-mkpasswd-pbkdf2
- grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c util/mm.c kern/err.c
+ grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/emu/misc.c kern/emu/mm.c kern/err.c
  grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap -DGRUB_MKPASSWD=1
  
 +# Randomly generated
 +SUCCESSFUL_BOOT_STRING=3e49994fd5d82b7c9298d672d774080d
 +# tianocore cd access is very slow
 +BOOTCHECK_TIMEOUT=180
 +
 +bootcheck: $(BOOTCHECKS)
 +
  include $(srcdir)/conf/gcry.mk