diff options
author | Jonatan Pålsson <jonatan.p@gmail.com> | 2020-03-25 12:43:15 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2020-03-27 16:53:25 -0700 |
commit | 79d9fc23e29f3e45ab6b753237980905eba6e49e (patch) | |
tree | 7d0f08d2d4d69f7b9ffe76648eb92c8e2ca59e66 | |
parent | 70a4908a97366b5829ecf537a4210235ec6236fb (diff) | |
download | meta-security-79d9fc23e29f3e45ab6b753237980905eba6e49e.tar.gz |
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>
-rw-r--r-- | recipes-security/sssd/sssd_1.16.4.bb | 6 |
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 \ | |||
33 | ac_cv_path_NSUPDATE=${bindir} ac_cv_prog_HAVE_PYTHON3=${PYTHON_DIR} \ | 33 | ac_cv_path_NSUPDATE=${bindir} ac_cv_prog_HAVE_PYTHON3=${PYTHON_DIR} \ |
34 | " | 34 | " |
35 | 35 | ||
36 | PACKAGECONFIG ?="nss nscd" | 36 | PACKAGECONFIG ?="nss nscd autofs" |
37 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" | 37 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" |
38 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | 38 | PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" |
39 | 39 | ||
40 | PACKAGECONFIG[autofs] = "--with-autofs, --with-autofs=no" | ||
40 | PACKAGECONFIG[crypto] = "--with-crypto=libcrypto, , libcrypto" | 41 | PACKAGECONFIG[crypto] = "--with-crypto=libcrypto, , libcrypto" |
41 | PACKAGECONFIG[curl] = "--with-secrets --with-kcm, --without-secrets --without-kcm, curl" | 42 | PACKAGECONFIG[curl] = "--with-secrets --with-kcm, --without-secrets --without-kcm, curl" |
42 | PACKAGECONFIG[http] = "--with-secrets, --without-secrets, apache2" | 43 | PACKAGECONFIG[http] = "--with-secrets, --without-secrets, apache2" |
@@ -96,8 +97,7 @@ CONFFILES_${PN} = "${sysconfdir}/${BPN}/${BPN}.conf" | |||
96 | INITSCRIPT_NAME = "sssd" | 97 | INITSCRIPT_NAME = "sssd" |
97 | INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." | 98 | INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." |
98 | SYSTEMD_SERVICE_${PN} = " \ | 99 | SYSTEMD_SERVICE_${PN} = " \ |
99 | sssd-autofs.service \ | 100 | ${@bb.utils.contains('PACKAGECONFIG', 'autofs', 'sssd-autofs.service sssd-autofs.socket', '', d)} \ |
100 | sssd-autofs.socket \ | ||
101 | sssd-ifp.service \ | 101 | sssd-ifp.service \ |
102 | sssd-nss.service \ | 102 | sssd-nss.service \ |
103 | sssd-nss.socket \ | 103 | sssd-nss.socket \ |