aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-security
diff options
context:
space:
mode:
authorJonatan Pålsson <jonatan.p@gmail.com>2020-03-25 12:43:15 +0100
committerArmin Kuster <akuster808@gmail.com>2020-03-27 16:53:25 -0700
commit79d9fc23e29f3e45ab6b753237980905eba6e49e (patch)
tree7d0f08d2d4d69f7b9ffe76648eb92c8e2ca59e66 /recipes-security
parent70a4908a97366b5829ecf537a4210235ec6236fb (diff)
downloadmeta-security-79d9fc23e29f3e45ab6b753237980905eba6e49e.tar.gz
meta-security-79d9fc23e29f3e45ab6b753237980905eba6e49e.tar.bz2
meta-security-79d9fc23e29f3e45ab6b753237980905eba6e49e.zip
sssd: Add autofs PACKAGECONFIG
autofs was previously on by default, so add it to the default PACKAGECONFIG. The systemd files are only installed when --with-autofs is passed to configure, so conditionally add them to SYSTEMD_SERVICE. Signed-off-by: Jonatan Pålsson <jonatan.p@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'recipes-security')
-rw-r--r--recipes-security/sssd/sssd_1.16.4.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-security/sssd/sssd_1.16.4.bb b/recipes-security/sssd/sssd_1.16.4.bb
index b0b7038..24cc003 100644
--- a/recipes-security/sssd/sssd_1.16.4.bb
+++ b/recipes-security/sssd/sssd_1.16.4.bb
@@ -33,10 +33,11 @@ CACHED_CONFIGUREVARS = "ac_cv_member_struct_ldap_conncb_lc_arg=no \
ac_cv_path_NSUPDATE=${bindir} ac_cv_prog_HAVE_PYTHON3=${PYTHON_DIR} \
"
-PACKAGECONFIG ?="nss nscd"
+PACKAGECONFIG ?="nss nscd autofs"
PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}"
PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+PACKAGECONFIG[autofs] = "--with-autofs, --with-autofs=no"
PACKAGECONFIG[crypto] = "--with-crypto=libcrypto, , libcrypto"
PACKAGECONFIG[curl] = "--with-secrets --with-kcm, --without-secrets --without-kcm, curl"
PACKAGECONFIG[http] = "--with-secrets, --without-secrets, apache2"
@@ -96,8 +97,7 @@ CONFFILES_${PN} = "${sysconfdir}/${BPN}/${BPN}.conf"
INITSCRIPT_NAME = "sssd"
INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
SYSTEMD_SERVICE_${PN} = " \
- sssd-autofs.service \
- sssd-autofs.socket \
+ ${@bb.utils.contains('PACKAGECONFIG', 'autofs', 'sssd-autofs.service sssd-autofs.socket', '', d)} \
sssd-ifp.service \
sssd-nss.service \
sssd-nss.socket \