diff mbox series

ecryptfs-utils: add linux-pam dependency if PAM has been enabled

Message ID CAJPHfYOm0O9WSRv-u1huwqzeEKBsKEEpsqTjd3ugJ=NwiwwSUw@mail.gmail.com
State Accepted
Headers show
Series ecryptfs-utils: add linux-pam dependency if PAM has been enabled | expand

Commit Message

Yi Zheng Nov. 27, 2019, 4:23 a.m. UTC 
If linux-pam has been selected, we want to build pam_ecryptfs.so
        and install it into /lib/security/

Signed-off-by: Yi Zheng <goodmenzy@gmail.com>
---
 package/ecryptfs-utils/ecryptfs-utils.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--
2.24.0

Comments

Thomas Petazzoni Dec. 24, 2019, 2:10 p.m. UTC | #1 
On Wed, 27 Nov 2019 12:23:48 +0800
Yi Zheng <goodmenzy@gmail.com> wrote:

>         If linux-pam has been selected, we want to build pam_ecryptfs.so
>         and install it into /lib/security/
> 
> Signed-off-by: Yi Zheng <goodmenzy@gmail.com>
> ---
>  package/ecryptfs-utils/ecryptfs-utils.mk | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/ecryptfs-utils/ecryptfs-utils.mk
b/package/ecryptfs-utils/ecryptfs-utils.mk
index eb3194b6d0..326ff4f2dd 100644
--- a/package/ecryptfs-utils/ecryptfs-utils.mk
+++ b/package/ecryptfs-utils/ecryptfs-utils.mk
@@ -11,13 +11,20 @@  ECRYPTFS_UTILS_LICENSE = GPL-2.0+
 ECRYPTFS_UTILS_LICENSE_FILES = COPYING

 ECRYPTFS_UTILS_DEPENDENCIES = keyutils libnss host-intltool
-ECRYPTFS_UTILS_CONF_OPTS = --disable-pywrap --disable-pam
+ECRYPTFS_UTILS_CONF_OPTS = --disable-pywrap

 #Needed for build system to find pk11func.h and libnss3.so
 ECRYPTFS_UTILS_CONF_ENV = \
        NSS_CFLAGS="-I$(STAGING_DIR)/usr/include/nss
-I$(STAGING_DIR)/usr/include/nspr" \
        NSS_LIBS="-lnss3"

+ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
+ECRYPTFS_UTILS_CONF_OPTS += --enable-pam
+ECRYPTFS_UTILS_DEPENDENCIES += linux-pam
+else
+ECRYPTFS_UTILS_CONF_OPTS += --disable-pam
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 ECRYPTFS_UTILS_CONF_OPTS += --enable-openssl
 ECRYPTFS_UTILS_DEPENDENCIES += openssl