From 1c510169922752bc447a2ea63ff51d08280f6ec9 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Wed, 12 Jun 2019 14:35:33 -0700 Subject: 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 Change-Id: I98cd1b07fb6b3050ac3c95609fbbcdc71943a7bd Signed-off-by: Brad Bishop --- meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb | 3 --- meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'meta-phosphor/recipes-phosphor') 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 \ -- cgit v1.2.3