Skip to contentSkip to conversation

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

PATCH New Yi Zheng 2 participants 2 messages Nov 27, 2019 – Dec 24, 2019 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Yi Zheng

author
#1 lore raw

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

If linux-pam has been selected, we want to build pam_ecryptfs.so and install it into /lib/security/

---
 package/ecryptfs-utils/ecryptfs-utils.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

b/package/ecryptfs-utils/ecryptfs-utils.mk
index eb3194b6d0..326ff4f2dd 100644

package/ecryptfs-utils/ecryptfs-utils.mk +8 -2
@@ -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
--
2.24.0

#2 lore raw

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

Quoted 7 lines · On Wed, 27 Nov 2019 12:23:48 +0800 Yi Zheng <[email protected]> wrote:

If linux-pam has been selected, we want to build pam_ecryptfs.so and install it into /lib/security/

---
 package/ecryptfs-utils/ecryptfs-utils.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com