From 31ecbfbce51fd02e6ae1fd31cdf04e7d0bebee0d Mon Sep 17 00:00:00 2001
From: "Anton D. Kachalov" <gmouse@google.com>
Date: Wed, 21 Apr 2021 19:23:55 +0200
Subject: certificate-manager: ship nslcd config from user-manager repo

This change required as a part of privilege separation work:
   https://github.com/openbmc/openbmc/issues/3383

This change should be merged after individual repo change:
   https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-user-manager/+/42633

Signed-off-by: Anton D. Kachalov <gmouse@google.com>
Change-Id: I3d68a3cb27f822b05027ef07a89e6c65f6859178
---
 .../certificate/phosphor-nslcd-cert-config.bb      | 30 ----------------------
 .../certificate/phosphor-nslcd-cert-config/env     |  9 -------
 .../packagegroups/packagegroup-obmc-apps.bb        |  1 -
 .../users/phosphor-user-manager_git.bb             |  7 ++++-
 4 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100644 meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config.bb
 delete mode 100644 meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config/env

(limited to 'meta-phosphor')

diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config.bb
deleted file mode 100644
index 7b1e26412..000000000
--- a/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SUMMARY = "Phosphor certificate manager configuration for a nslcd certificate"
-
-PR = "r1"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-
-RDEPENDS:${PN} = "phosphor-certificate-manager"
-
-inherit allarch
-
-SRC_URI = "file://env"
-
-FILES:${PN} = "${datadir}"
-
-do_install() {
-	install -D ${WORKDIR}/env ${D}/${datadir}/phosphor-certificate-manager/nslcd
-}
-
-pkg_postinst:${PN}() {
-	LINK="$D$systemd_system_unitdir/multi-user.target.wants/phosphor-certificate-manager@nslcd.service"
-	TARGET="../phosphor-certificate-manager@.service"
-	mkdir -p $D$systemd_system_unitdir/multi-user.target.wants
-	ln -s $TARGET $LINK
-}
-
-pkg_prerm:${PN}() {
-	LINK="$D$systemd_system_unitdir/multi-user.target.wants/phosphor-certificate-manager@nslcd.service"
-	rm $LINK
-}
diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config/env b/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config/env
deleted file mode 100644
index 8ac1bf77e..000000000
--- a/meta-phosphor/recipes-phosphor/certificate/phosphor-nslcd-cert-config/env
+++ /dev/null
@@ -1,9 +0,0 @@
-#REST URI endpoint
-#example: /xyz/openbmc_project/certs/client/ldap
-ENDPOINT=ldap
-
-#Path for the certificate file
-CERTPATH=/etc/nslcd/certs/cert.pem
-
-#Type of the service client/server
-TYPE=client
diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index c035c6dcb..6d7d76ac6 100644
--- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -195,5 +195,4 @@ RDEPENDS:${PN}-user-mgmt-ldap = " \
         ${PN}-user-mgmt \
         nss-pam-ldapd \
         phosphor-ldap \
-        phosphor-nslcd-cert-config \
         "
diff --git a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb
index 18a7c505a..f74dc4e4f 100644
--- a/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/users/phosphor-user-manager_git.bb
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 inherit autotools pkgconfig
 inherit obmc-phosphor-dbus-service
 
+DEPENDS += "dbus"
 DEPENDS += "autoconf-archive-native"
 DEPENDS += "sdbusplus"
 DEPENDS += "phosphor-logging"
@@ -31,10 +32,14 @@ FILES:phosphor-ldap += " \
         ${bindir}/phosphor-ldap-conf \
         ${bindir}/phosphor-ldap-mapper \
 "
+FILES:${PN} += " \
+        ${base_libdir}/systemd \
+        ${datadir}/phosphor-certificate-manager \
+"
 DBUS_SERVICE:phosphor-ldap = " \
         xyz.openbmc_project.Ldap.Config.service \
         xyz.openbmc_project.LDAP.PrivilegeMapper.service \
 "
 SRC_URI += "git://github.com/openbmc/phosphor-user-manager"
-SRCREV = "a260f187436837aec493baef0a5e7063fe11ee92"
+SRCREV = "607ed50ae1c4817969a117d951a3e90f686fbde0"
 S = "${WORKDIR}/git"
-- 
cgit v1.2.3