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>
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 832eb04..0000000
--- 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 40e6897..0000000
--- 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 e3f627f..0000000
--- 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 27c647a..8a39748 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"