diff options
| author | Matt Spinler <spinler@us.ibm.com> | 2018-10-26 14:37:02 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-02-01 09:22:39 -0500 |
| commit | 99826b0b173d96eddc7897fdaae2293a298556f4 (patch) | |
| tree | f690f5480d1601db30053c832b268bc6b508a263 /meta-ibm | |
| parent | 3a81465255b76f2e917a8640ee401b39eda99a00 (diff) | |
| download | talos-openbmc-99826b0b173d96eddc7897fdaae2293a298556f4.tar.gz talos-openbmc-99826b0b173d96eddc7897fdaae2293a298556f4.zip | |
meta-ibm: Remove bmcweb overrides
As bmcweb will be enabled from meta-phoshor, that's where
the socket and service files will be, and where the repo
will be pulled in from. No need to it from meta-ibm.
(From meta-ibm rev: e9f1abf282032579fb400d5511760de080cbeac2)
Change-Id: Ifa94158a2401eaad6eb44dbed1ca9bf81bce0e35
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ibm')
4 files changed, 0 insertions, 28 deletions
diff --git a/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.service b/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.service deleted file mode 100644 index 832eb0491..000000000 --- a/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=BMC Redfish Server (bmcweb) -After=network.target -After=obmc-webserver-pre.target - -[Service] -Restart=always -ExecStart=/usr/bin/env bmcweb -SyslogIdentifier=bmcweb diff --git a/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.socket b/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.socket deleted file mode 100644 index 40e68975c..000000000 --- a/meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Phosphor redfish socket (bmcweb) - -[Socket] -ListenStream=127.0.0.1:8082 - -[Install] -WantedBy=sockets.target diff --git a/meta-ibm/recipes-phosphor/bmcweb/bmcweb_%.bbappend b/meta-ibm/recipes-phosphor/bmcweb/bmcweb_%.bbappend deleted file mode 100644 index e3f627f53..000000000 --- a/meta-ibm/recipes-phosphor/bmcweb/bmcweb_%.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Modifications to support Nginx" - -# Behind NGINX so disable SSL in bmcweb -EXTRA_OECMAKE += "-DBMCWEB_INSECURE_DISABLE_SSL=ON" - -# Only need redfish support -EXTRA_OECMAKE += "-DBMCWEB_ENABLE_KVM=OFF -DBMCWEB_ENABLE_DBUS_REST=OFF" - -# override service and socket file to use nginx -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 27c647a07..8a397485f 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,3 +1,2 @@ RDEPENDS_${PN}-logging += "ibm-logging" -RDEPENDS_${PN}-extras += " bmcweb" RDEPENDS_${PN}-remove += " phosphor-rest phosphor-gevent" |
