Yocto Project Discussions
 help / color / mirror / Atom feed
From: "Jonatan Pålsson" <jonatan.p@gmail.com>
To: yocto@lists.yoctoproject.org
Cc: "Jonatan Pålsson" <jonatan.p@gmail.com>
Subject: [meta-security][PATCH 3/6] sssd: Add sudo PACKAGECONFIG
Date: Wed, 25 Mar 2020 12:43:16 +0100	[thread overview]
Message-ID: <20200325114319.2115155-3-jonatan.p@gmail.com> (raw)
In-Reply-To: <20200325114319.2115155-1-jonatan.p@gmail.com>

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 <jonatan.p@gmail.com>
---
 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"
 
-- 
2.26.0


  parent reply	other threads:[~2020-03-25 11:44 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-25 11:43 [meta-security][PATCH 1/6] sssd: Sort PACKAGECONFIG entries Jonatan Pålsson
2020-03-25 11:43 ` [meta-security][PATCH 2/6] sssd: Add autofs PACKAGECONFIG Jonatan Pålsson
2020-03-25 11:43 ` Jonatan Pålsson [this message]
2020-03-25 11:43 ` [meta-security][PATCH 4/6] sssd: Add missing files to SYSTEMD_SERVICE Jonatan Pålsson
2020-03-25 11:43 ` [meta-security][PATCH 5/6] sssd: Add missing DEPENDS on jansson Jonatan Pålsson
2020-03-25 11:43 ` [meta-security][PATCH 6/6] sssd: Add infopipe PACKAGECONFIG Jonatan Pålsson
2020-03-28  0:05 ` [yocto] [meta-security][PATCH 1/6] sssd: Sort PACKAGECONFIG entries akuster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200325114319.2115155-3-jonatan.p@gmail.com \
    --to=jonatan.p@gmail.com \
    --cc=yocto@lists.yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox