From 52e3654d34154f2ab40faa0d9ff4e690486ad9d0 Mon Sep 17 00:00:00 2001 From: Jonatan Pålsson Date: Wed, 25 Mar 2020 12:43:16 +0100 Subject: sssd: Add sudo PACKAGECONFIG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit sudo was previously on by default, so add it to the default PACKAGECONFIG. The systemd files are only installed when --with-sudo is passed to configure, so conditionally add them to SYSTEMD_SERVICE. Signed-off-by: Jonatan Pålsson Signed-off-by: Armin Kuster --- recipes-security/sssd/sssd_1.16.4.bb | 6 +++--- 1 file 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 24cc003..99697fc 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 \ ac_cv_path_NSUPDATE=${bindir} ac_cv_prog_HAVE_PYTHON3=${PYTHON_DIR} \ " -PACKAGECONFIG ?="nss nscd autofs" +PACKAGECONFIG ?="nss nscd autofs sudo" PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" @@ -49,6 +49,7 @@ PACKAGECONFIG[python3] = "--with-python3-bindings, --without-python3-bindings" PACKAGECONFIG[samba] = "--with-samba, --with-samba=no, samba" PACKAGECONFIG[selinux] = "--with-selinux, --with-selinux=no --with-semanage=no, libselinux" PACKAGECONFIG[ssh] = "--with-ssh, --with-ssh=no, " +PACKAGECONFIG[sudo] = "--with-sudo, --with-sudo=no, " PACKAGECONFIG[systemd] = "--with-initscript=systemd,--with-initscript=sysv" EXTRA_OECONF += " \ @@ -98,6 +99,7 @@ INITSCRIPT_NAME = "sssd" INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ." SYSTEMD_SERVICE_${PN} = " \ ${@bb.utils.contains('PACKAGECONFIG', 'autofs', 'sssd-autofs.service sssd-autofs.socket', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'sudo', 'sssd-sudo.service sssd-sudo.socket', '', d)} \ sssd-ifp.service \ sssd-nss.service \ sssd-nss.socket \ @@ -107,8 +109,6 @@ SYSTEMD_SERVICE_${PN} = " \ sssd-secrets.service \ sssd-secrets.socket \ sssd.service \ - sssd-sudo.service \ - sssd-sudo.socket \ " SYSTEMD_AUTO_ENABLE = "disable" -- cgit v1.2.3-54-g00ecf