commit 44b40cde900734adaaf4e87f6fce511f414a6519
author Nan Zhou <nanzhou@google.com> Fri Oct 25 18:10:12 2024 +0000
committer Vivekanand Veeracholan <vveerach@google.com> Mon Oct 28 17:55:47 2024 +0000
tree 84d3e745c0e4c0f17078c4ebd350e9c34265a5c8
parent e8717383dcbbc06374c7dddda2f01c009e8f9c1e

bmcweb: remove service override

Files moved to bmcweb in
https://gbmc-review.googlesource.com/c/gbmcweb/+/30294

Tested: see logs there

Fusion: NA; needed for urgent bug fix. will run fusion on HEAD, but
the change is manually tested; fusion://

Google-Bug-Id: 366281170
Change-Id: I28a06abbdbe60780ed1f3a8dc8115c7a547b08ff
Signed-off-by: Nan Zhou <nanzhou@google.com>
(cherry picked from commit f475bca2ebe29d5790ab2d9ca08d5af4b6e74298)

recipes-phosphor/interfaces/bmcweb/service-override.conf

diff --git a/recipes-phosphor/interfaces/bmcweb/service-override.conf b/recipes-phosphor/interfaces/bmcweb/service-override.conf
deleted file mode 100644
index fd54928..0000000
--- a/recipes-phosphor/interfaces/bmcweb/service-override.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-PartOf=trust_bundle.target
-PartOf=server_creds.target
-Wants=phosphor-certificate-manager@authority.service
-After=phosphor-certificate-manager@authority.service
-Wants=phosphor-certificate-manager@bmcweb.service
-After=phosphor-certificate-manager@bmcweb.service
-Wants=authz_server.service
-After=authz_server.service
-
-[Service]
-Restart=on-failure

recipes-phosphor/interfaces/bmcweb_%.bbappend

diff --git a/recipes-phosphor/interfaces/bmcweb_%.bbappend b/recipes-phosphor/interfaces/bmcweb_%.bbappend
index 9c9c664..54557f1 100644
--- a/recipes-phosphor/interfaces/bmcweb_%.bbappend
+++ b/recipes-phosphor/interfaces/bmcweb_%.bbappend
@@ -24,7 +24,6 @@
 "
 
 SRC_URI:append:gbmc = " \
-  file://service-override.conf \
   file://delay-reset@.service \
   file://delay-reset.sh \
 "
@@ -42,15 +41,10 @@
      file://50-gbmc-bmcweb.rules \
 "
 
-FILES:${PN}:append:gbmc = " \
-    ${systemd_system_unitdir}/bmcweb.service.d/service-override.conf \
-"
 
 SYSTEMD_SERVICE:${PN} += " delay-reset@.service"
 
 do_install:append:gbmc() {
-   install -d ${D}${systemd_system_unitdir}/bmcweb.service.d
-   install -m 0644 ${WORKDIR}/service-override.conf ${D}${systemd_system_unitdir}/bmcweb.service.d/
    install -m 0644 ${WORKDIR}/delay-reset@.service ${D}${systemd_system_unitdir}/
    install -m 0755 ${WORKDIR}/delay-reset.sh ${D}${bindir}/
 }