diff options
| author | Jonatan Pålsson <jonatan.p@gmail.com> | 2020-03-25 12:43:19 +0100 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2020-03-27 16:53:25 -0700 |
| commit | 47de50efdbd9b86951d90a7ac290aff385e37cad (patch) | |
| tree | 8c4b6a2c1199f74551d61c21d9b2ecd9afc7f665 | |
| parent | e54b07c3d4be6d3475920f0edf80e4bcf1093ad3 (diff) | |
| download | meta-security-47de50efdbd9b86951d90a7ac290aff385e37cad.tar.gz | |
sssd: Add infopipe PACKAGECONFIG
infopipe was previously on by default, so add it to the default
PACKAGECONFIG.
The systemd files are only installed when --with-infopipe 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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes-security/sssd/sssd_1.16.4.bb b/recipes-security/sssd/sssd_1.16.4.bb index ff0b580..7ea1586 100644 --- a/recipes-security/sssd/sssd_1.16.4.bb +++ b/recipes-security/sssd/sssd_1.16.4.bb | |||
| @@ -33,7 +33,7 @@ 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 autofs sudo" | 36 | PACKAGECONFIG ?="nss nscd autofs sudo infopipe" |
| 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 | ||
| @@ -41,6 +41,7 @@ PACKAGECONFIG[autofs] = "--with-autofs, --with-autofs=no" | |||
| 41 | PACKAGECONFIG[crypto] = "--with-crypto=libcrypto, , libcrypto" | 41 | PACKAGECONFIG[crypto] = "--with-crypto=libcrypto, , libcrypto" |
| 42 | PACKAGECONFIG[curl] = "--with-secrets --with-kcm, --without-secrets --without-kcm, curl jansson" | 42 | PACKAGECONFIG[curl] = "--with-secrets --with-kcm, --without-secrets --without-kcm, curl jansson" |
| 43 | PACKAGECONFIG[http] = "--with-secrets, --without-secrets, apache2" | 43 | PACKAGECONFIG[http] = "--with-secrets, --without-secrets, apache2" |
| 44 | PACKAGECONFIG[infopipe] = "--with-infopipe, --with-infopipe=no, " | ||
| 44 | PACKAGECONFIG[manpages] = "--with-manpages, --with-manpages=no" | 45 | PACKAGECONFIG[manpages] = "--with-manpages, --with-manpages=no" |
| 45 | PACKAGECONFIG[nl] = "--with-libnl, --with-libnl=no, libnl" | 46 | PACKAGECONFIG[nl] = "--with-libnl, --with-libnl=no, libnl" |
| 46 | PACKAGECONFIG[nscd] = "--with-nscd=${sbindir}, --with-nscd=no " | 47 | PACKAGECONFIG[nscd] = "--with-nscd=${sbindir}, --with-nscd=no " |
| @@ -100,9 +101,9 @@ INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." | |||
| 100 | SYSTEMD_SERVICE_${PN} = " \ | 101 | SYSTEMD_SERVICE_${PN} = " \ |
| 101 | ${@bb.utils.contains('PACKAGECONFIG', 'autofs', 'sssd-autofs.service sssd-autofs.socket', '', d)} \ | 102 | ${@bb.utils.contains('PACKAGECONFIG', 'autofs', 'sssd-autofs.service sssd-autofs.socket', '', d)} \ |
| 102 | ${@bb.utils.contains('PACKAGECONFIG', 'curl', 'sssd-kcm.service sssd-kcm.socket', '', d)} \ | 103 | ${@bb.utils.contains('PACKAGECONFIG', 'curl', 'sssd-kcm.service sssd-kcm.socket', '', d)} \ |
| 104 | ${@bb.utils.contains('PACKAGECONFIG', 'infopipe', 'sssd-ifp.service ', '', d)} \ | ||
| 103 | ${@bb.utils.contains('PACKAGECONFIG', 'ssh', 'sssd-ssh.service sssd-ssh.socket', '', d)} \ | 105 | ${@bb.utils.contains('PACKAGECONFIG', 'ssh', 'sssd-ssh.service sssd-ssh.socket', '', d)} \ |
| 104 | ${@bb.utils.contains('PACKAGECONFIG', 'sudo', 'sssd-sudo.service sssd-sudo.socket', '', d)} \ | 106 | ${@bb.utils.contains('PACKAGECONFIG', 'sudo', 'sssd-sudo.service sssd-sudo.socket', '', d)} \ |
| 105 | sssd-ifp.service \ | ||
| 106 | sssd-nss.service \ | 107 | sssd-nss.service \ |
| 107 | sssd-nss.socket \ | 108 | sssd-nss.socket \ |
| 108 | sssd-pam-priv.socket \ | 109 | sssd-pam-priv.socket \ |
