From 4840628bc9eaa19abbc3cbb51e0abf23f9d5d244 Mon Sep 17 00:00:00 2001
From: Patrick Venture <venture@google.com>
Date: Thu, 11 Oct 2018 19:18:21 -0700
Subject: meta-ibm: bmcweb: set wildcard

Set wildcard for bmcweb.  Set both folder and bbappend to match.

(From meta-ibm rev: cccaa8ffeada2e655e4456da751bcc51f70e5903)

Change-Id: I2d03ea22cb5f184b0494dee685d58dcfbd63c3b1
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 meta-ibm/recipes-phosphor/bmcweb/bmcweb%.bbappend       | 10 ++++++++++
 meta-ibm/recipes-phosphor/bmcweb/bmcweb%/bmcweb.service |  9 +++++++++
 meta-ibm/recipes-phosphor/bmcweb/bmcweb%/bmcweb.socket  |  8 ++++++++
 meta-ibm/recipes-phosphor/bmcweb/bmcweb.bbappend        | 10 ----------
 meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.service  |  9 ---------
 meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.socket   |  8 --------
 6 files changed, 27 insertions(+), 27 deletions(-)
 create mode 100644 meta-ibm/recipes-phosphor/bmcweb/bmcweb%.bbappend
 create mode 100644 meta-ibm/recipes-phosphor/bmcweb/bmcweb%/bmcweb.service
 create mode 100644 meta-ibm/recipes-phosphor/bmcweb/bmcweb%/bmcweb.socket
 delete mode 100644 meta-ibm/recipes-phosphor/bmcweb/bmcweb.bbappend
 delete mode 100644 meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.service
 delete mode 100644 meta-ibm/recipes-phosphor/bmcweb/bmcweb/bmcweb.socket

diff --git a/meta-ibm/recipes-phosphor/bmcweb/bmcweb%.bbappend b/meta-ibm/recipes-phosphor/bmcweb/bmcweb%.bbappend
new file mode 100644
index 000000000..3de4e3c08
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/bmcweb/bmcweb%.bbappend
@@ -0,0 +1,10 @@
+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 -DBMCWEB_ENABLE_STATIC_HOSTING=OFF"
+
+# override service and socket file to use nginx
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-ibm/recipes-phosphor/bmcweb/bmcweb%/bmcweb.service b/meta-ibm/recipes-phosphor/bmcweb/bmcweb%/bmcweb.service
new file mode 100644
index 000000000..832eb0491
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/bmcweb/bmcweb%/bmcweb.service
@@ -0,0 +1,9 @@
+[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
new file mode 100644
index 000000000..40e68975c
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/bmcweb/bmcweb%/bmcweb.socket
@@ -0,0 +1,8 @@
+[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 3de4e3c08..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 -DBMCWEB_ENABLE_STATIC_HOSTING=OFF"
-
-# override service and socket file to use nginx
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
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
-- 
cgit v1.2.1