vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix mismerge with trunk (progname)

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-05 18:59:36 +01:00
parent 7d624c2949
commit fd39f820fd
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conf/common.rmk
View file

@ -650,7 +650,7 @@ password_pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
password_pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
bin_UTILITIES += grub-mkpasswd-pbkdf2
grub_mkpasswd_pbkdf2_SOURCES = 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_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
include $(srcdir)/conf/gcry.mk