Signed-off-by: Ladislav Michl <[email protected]>
---
rules/libcap.in | 1 +
rules/libcap.make | 14 ++++++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/rules/libcap.in b/rules/libcap.in
index 6262467d1..5fef3a033 100644
--- a/rules/libcap.in
+++ b/rules/libcap.in
@@ -3,6 +3,7 @@
menuconfig LIBCAP
tristate
select HOST_GPERF
+ select PAM if GLOBAL_PAM
prompt "libcap "
help
A library for getting and setting POSIX.1e capabilities.
diff --git a/rules/libcap.make b/rules/libcap.make
index 2bb25a068..a8e94c5f8 100644
--- a/rules/libcap.make
+++ b/rules/libcap.make
@@ -30,11 +30,13 @@ LIBCAP_LICENSE_FILES :=
file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1
# ----------------------------------------------------------------------------
LIBCAP_MAKE_OPT := \
- prefix=/usr PAM_CAP=no DYNAMIC=yes \
- LIBATTR=$(call ptx/yesno, PTXCONF_LIBCAP_SETCAP) \
- lib=lib \
+ prefix=/usr lib=lib \
CC=$(CROSS_CC) \
- BUILD_CC=$(HOSTCC)
+ BUILD_CC=$(HOSTCC) \
+ DYNAMIC=yes \
+ GOLANG=no \
+ LIBATTR=$(call ptx/yesno, PTXCONF_LIBCAP_SETCAP) \
+ PAM_CAP=$(call ptx/yesno, PTXCONF_GLOBAL_PAM)
LIBCAP_INSTALL_OPT := \
$(LIBCAP_MAKE_OPT) \
@@ -57,6 +59,10 @@ $(STATEDIR)/libcap.targetinstall:
@$(call install_copy, libcap, 0, 0, 0755, -, /usr/sbin/getpcaps)
@$(call install_copy, libcap, 0, 0, 0755, -, /usr/sbin/capsh)
@$(call install_lib, libcap, 0, 0, 0644, libcap)
+ifdef PTXCONF_GLOBAL_PAM
+ @$(call install_copy, libcap, 0, 0, 0755, -, \
+ /usr/lib/security/pam_cap.so)
+endif
ifdef PTXCONF_LIBCAP_SETCAP
@$(call install_copy, libcap, 0, 0, 0755, -, /usr/sbin/setcap)
@$(call install_copy, libcap, 0, 0, 0755, -, /usr/sbin/getcap)
--
2.27.0
_______________________________________________
ptxdist mailing list
[email protected]
To unsubscribe, send a mail with subject "unsubscribe" to
[email protected]
