summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Tanous <ed.tanous@intel.com>2019-06-13 00:35:33 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-06-13 05:10:03 +0300
commit1c510169922752bc447a2ea63ff51d08280f6ec9 (patch)
treebdb32b63ba203d830a2ff9ef9a07b1259953c7ff
parent4806df5a0cc6536ecf694f16dade6577758f1d87 (diff)
downloadopenbmc-1c510169922752bc447a2ea63ff51d08280f6ec9.tar.xz
include bmcweb-cert-config the same as bmcweb
bmcweb Redfish certificate service in this review: https://gerrit.openbmc-project.xyz/c/openbmc/bmcweb/+/18545 Will require phosphor-bmcweb-cert-config to function correctly. Move the location that this is included to ensure that they are included together. Tested: built image with aformentioned patch. observed that GET /redfish/v1/Managers/bmc/NetworkProtocol/HTTPS/Certificates/1 no longer throws 500 errors on image types that are not exactly obmc-phosphor-image targets. (From meta-phosphor rev: 80c1e1a4a052f23e05d87d9dce0aa57d9627005e) Signed-off-by: Ed Tanous <ed.tanous@intel.com> Change-Id: I98cd1b07fb6b3050ac3c95609fbbcdc71943a7bd Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
-rw-r--r--meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb3
-rw-r--r--meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb1
2 files changed, 1 insertions, 3 deletions
diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb
index 70cde265a..eb82b3845 100644
--- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb
+++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb
@@ -4,6 +4,3 @@ IMAGE_LINGUAS = ""
inherit obmc-phosphor-image
-OBMC_IMAGE_EXTRA_INSTALL_append = "\
- phosphor-bmcweb-cert-config \
- "
diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index fdec305f5..175b37862 100644
--- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -39,6 +39,7 @@ RDEPENDS_${PN}-chassis-state-mgmt = " \
SUMMARY_${PN}-extras = "Extra features"
RDEPENDS_${PN}-extras = " \
bmcweb \
+ phosphor-bmcweb-cert-config \
obmc-ikvm \
phosphor-dbus-monitor \
phosphor-systemd-policy \