diff options
| author | jmbills <jason.m.bills@intel.com> | 2022-01-18 21:55:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 21:55:05 +0300 |
| commit | 7cf0c1cd0ce835d1833509b7b911e8a97380278b (patch) | |
| tree | 0b45c3beaa9874facc4ed1a2395a31e42be0135d /meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb | |
| parent | 4dac5fcd49b5e2de1074f1363775ec0f19041072 (diff) | |
| parent | 1fc0d70f658da30091bcd49f9bf29aecd6b99ba7 (diff) | |
| download | openbmc-7cf0c1cd0ce835d1833509b7b911e8a97380278b.tar.xz | |
Merge pull request #76 from Intel-BMC/update1-0.86
Update
Diffstat (limited to 'meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb')
| -rw-r--r-- | meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb index 30730a4e3..b858958f0 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -9,11 +9,11 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager" -SRCREV = "811a29e1941db0157f49d2e05491be945f7b2f07" +SRCREV = "7f7b47bea7bbd518d1ff5a306ecf3806cf8d0834" inherit autotools \ pkgconfig \ - obmc-phosphor-systemd + systemd DEPENDS = " \ autoconf-archive-native \ @@ -28,9 +28,18 @@ S = "${WORKDIR}/git" EXTRA_OECONF += "--disable-tests" -CERT_TMPL = "phosphor-certificate-manager@.service" -SYSTEMD_SERVICE:${PN} = "${CERT_TMPL}" +SYSTEMD_SERVICE:${PN} = "phosphor-certificate-manager@.service" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "bmcweb-cert nslcd-authority-cert" PACKAGECONFIG[ibm-hypervisor-cert] = "--enable-ca-cert-extension,," -SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'ibm-hypervisor-cert', 'bmc-vmi-ca-manager.service', '', d)}" +PACKAGECONFIG[bmcweb-cert] = "--enable-bmcweb-cert-config,," +PACKAGECONFIG[nslcd-authority-cert] = "--enable-nslcd-authority-cert-config,," + +SYSTEMD_SERVICE:${PN} = " \ + phosphor-certificate-manager@.service \ + ${@bb.utils.contains('PACKAGECONFIG', 'ibm-hypervisor-cert', 'bmc-vmi-ca-manager.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'nslcd-authority-cert', 'phosphor-certificate-manager@authority.service', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'bmcweb', 'phosphor-certificate-manager@bmcweb.service', '', d)} \ + " + +FILES:${PN}:append = " ${systemd_system_unitdir}/* ${datadir}/dbus-1" |