Merge pull request #505 from itay-grudev/gpg2-fix

GPG2 Fixes
linuxboot · Jan 26, 2019 · 1699771 · 1699771
2 parents 5eeb78b + 142d601
commit 1699771
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/boards/librem13v2/librem13v2.config b/boards/librem13v2/librem13v2.config
@@ -7,6 +7,7 @@ CONFIG_CRYPTSETUP=y
 CONFIG_FLASHROM=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG=y
+CONFIG_GPG2=y
 CONFIG_KEXEC=y
 CONFIG_UTIL_LINUX=y
 CONFIG_LVM2=y

diff --git a/boards/librem15v3/librem15v3.config b/boards/librem15v3/librem15v3.config
@@ -9,6 +9,7 @@ CONFIG_CRYPTSETUP=y
 CONFIG_FLASHROM=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG=y
+CONFIG_GPG2=y
 CONFIG_KEXEC=y
 CONFIG_UTIL_LINUX=y
 CONFIG_LVM2=y

diff --git a/initrd/bin/kexec-sign-config b/initrd/bin/kexec-sign-config
@@ -49,7 +49,7 @@ if [ -z "$param_files" ]; then
 fi
 
 for tries in 1 2 3; do
-	if sha256sum $param_files | gpg --no-tty\
+	if sha256sum $param_files | gpg \
 		--digest-algo SHA256 \
 		--detach-sign \
 		-a \

diff --git a/modules/pinentry b/modules/pinentry
@@ -18,6 +18,7 @@ pinentry_configure := ./configure \
 	--host x86_64-linux-musl \
 	--prefix "/" \
 	--enable-pinentry-tty \
+	--disable-libsecret \
 	--disable-fallback-curses \
 	--disable-pinentry-curses \
 	--disable-pinentry-qt5 \