From 609d48731fd3758910ed5a68d5ce1d6e80c2dfd3 Mon Sep 17 00:00:00 2001 From: "Anton D. Kachalov" Date: Fri, 19 Mar 2021 11:30:43 +0100 Subject: certificate-manager: supply configs from the repo This change is a part of the privilege seperation work which is tracked in: https://github.com/openbmc/openbmc/issues/3383 This change should be merged after individual repo change: https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-certificate-manager/+/41166 Signed-off-by: Anton D. Kachalov Change-Id: I72e4842e7aa6de2ae4bcbdbf00953b7a79a0f414 --- .../phosphor-certificate-manager_git.bb | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb') 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..d2a7e4fc4 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -9,14 +9,15 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager" -SRCREV = "811a29e1941db0157f49d2e05491be945f7b2f07" +SRCREV = "6dd1c2ad86507202dd55c533559e253f846e99c8" inherit autotools \ pkgconfig \ - obmc-phosphor-systemd + systemd DEPENDS = " \ autoconf-archive-native \ + dbus \ openssl \ phosphor-dbus-interfaces \ phosphor-logging \ @@ -28,9 +29,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 = " ${sysconfdir}/dbus-1 ${base_libdir} ${datadir} ${bindir}" -- cgit v1.2.3 From 549c226b56a15ebf2927d0cff1330e882eee75bd Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 4 Oct 2021 14:50:47 +0000 Subject: phosphor-certificate-manager: srcrev bump 6dd1c2ad86..ca12811702 Patrick Williams (2): cleanup sdbus CAMELCASE define exception: switch to public sdbus exception Change-Id: I50ce5f897768dc068876bc45fe1c5730945a6d9e Signed-off-by: Andrew Geissler --- .../recipes-phosphor/certificate/phosphor-certificate-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb') 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 d2a7e4fc4..371967d0f 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager" -SRCREV = "6dd1c2ad86507202dd55c533559e253f846e99c8" +SRCREV = "ca1281170219b3027fd4f75a9c4e94a52fb16312" inherit autotools \ pkgconfig \ -- cgit v1.2.3 From 140d0615b41e51b85b1b7652deb4f7797a903f91 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Mon, 4 Oct 2021 12:01:38 -0500 Subject: phosphor-certificate-manager: simplify FILES directive The recipe has collected a bunch of needless FILES settings. Simplify to the current minimum required set. Signed-off-by: Patrick Williams Change-Id: I0da538e22ea5d1284f32bd2d2c22bcb61db39bd1 --- .../recipes-phosphor/certificate/phosphor-certificate-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb') 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 371967d0f..9f2c745f4 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -43,4 +43,4 @@ SYSTEMD_SERVICE:${PN} = " \ ${@bb.utils.contains('PACKAGECONFIG', 'bmcweb', 'phosphor-certificate-manager@bmcweb.service', '', d)} \ " -FILES:${PN}:append = " ${sysconfdir}/dbus-1 ${base_libdir} ${datadir} ${bindir}" +FILES:${PN}:append = " ${systemd_system_unitdir}/*" -- cgit v1.2.3 From 24aeba061c046ccee5b636cf210ed73d916d5163 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 7 Oct 2021 13:30:54 +0000 Subject: phosphor-certificate-manager: srcrev bump ca12811702..7195799258 Patrick Williams (2): configure: simpify dbus policy install dir catch exceptions as const Update FILES and DEPENDS per 'simplify dbus policy' needs. Change-Id: Ic8d573eac341b34bc5f55e7c12dc737095a9f5f2 Signed-off-by: Andrew Geissler Signed-off-by: Patrick Williams --- .../recipes-phosphor/certificate/phosphor-certificate-manager_git.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb') 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 9f2c745f4..f3b6dc4e8 100644 --- a/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb @@ -9,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager" -SRCREV = "ca1281170219b3027fd4f75a9c4e94a52fb16312" +SRCREV = "71957992588d1b239c33ba25cf713b48b4014521" inherit autotools \ pkgconfig \ @@ -17,7 +17,6 @@ inherit autotools \ DEPENDS = " \ autoconf-archive-native \ - dbus \ openssl \ phosphor-dbus-interfaces \ phosphor-logging \ @@ -43,4 +42,4 @@ SYSTEMD_SERVICE:${PN} = " \ ${@bb.utils.contains('PACKAGECONFIG', 'bmcweb', 'phosphor-certificate-manager@bmcweb.service', '', d)} \ " -FILES:${PN}:append = " ${systemd_system_unitdir}/*" +FILES:${PN}:append = " ${systemd_system_unitdir}/* ${datadir}/dbus-1" -- cgit v1.2.3 From b895ca943cbebbaee4117136b2662ec9a0c6e141 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 29 Oct 2021 04:10:46 +0000 Subject: phosphor-certificate-manager: srcrev bump 7195799258..7f7b47bea7 Manojkiran Eda (1): Add OWNERS file Change-Id: I8affa79f6c17d0eda23c960807c2c2ac0e0eec45 Signed-off-by: Andrew Geissler --- .../recipes-phosphor/certificate/phosphor-certificate-manager_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/certificate/phosphor-certificate-manager_git.bb') 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 f3b6dc4e8..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,7 +9,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/phosphor-certificate-manager" -SRCREV = "71957992588d1b239c33ba25cf713b48b4014521" +SRCREV = "7f7b47bea7bbd518d1ff5a306ecf3806cf8d0834" inherit autotools \ pkgconfig \ -- cgit v1.2.3