[PATCH openbmc 03/20] Remove S and SRC_URI from c daemon class

[OpenBMC Patches]

From: Brad Bishop <bradleyb at us.ibm.com>

Initially this could be done in one place but as
sources move to git repositories this can't be done
in a generic manner.

Adapted existing recipes to this class change.
---
 meta-phosphor/classes/obmc-phosphor-c-daemon.bbclass           | 10 ++++------
 .../obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb |  4 ++++
 .../recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb   |  5 +++++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/meta-phosphor/classes/obmc-phosphor-c-daemon.bbclass b/meta-phosphor/classes/obmc-phosphor-c-daemon.bbclass
index e21d17c..0ceed96 100644
--- a/meta-phosphor/classes/obmc-phosphor-c-daemon.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-c-daemon.bbclass
@@ -4,14 +4,12 @@ inherit obmc-phosphor-systemd
 inherit obmc-phosphor-license
 
 DEPENDS += "glib-2.0"
-SRC_URI += " \
-        file://Makefile \
-        file://${PN}.c \
-        "
-S = "${WORKDIR}"
+
+INSTALL_NAME ?= "${PN}"
+BIN_NAME ?= "${INSTALL_NAME}"
 
 do_install_append() {
         # install the binary
         install -d ${D}${sbindir}
-        install -m 0755 ${WORKDIR}/${PN} ${D}${sbindir}
+        install -m 0755 ${S}/${BIN_NAME} ${D}${sbindir}/${INSTALL_NAME}
 }
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb
index 89fbdb1..f1a9eb9 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-sdbus/obmc-phosphor-example-sdbus.bb
@@ -7,5 +7,9 @@ DBUS_SERVICES = " \
         org.openbmc.examples.SDBusService1 \
         "
 
+S = "${WORKDIR}"
+SRC_URI += "file://Makefile \
+           file://obmc-phosphor-example-sdbus.c \
+           "
 inherit obmc-phosphor-sdbus-service
 inherit obmc-phosphor-c-daemon
diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb
index 79e2e6c..8c937c6 100644
--- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb
+++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-fan/obmc-phosphor-fand.bb
@@ -5,3 +5,8 @@ PR = "r1"
 inherit obmc-phosphor-fan-mgmt
 inherit obmc-phosphor-sdbus-service
 inherit obmc-phosphor-c-daemon
+
+S = "${WORKDIR}"
+SRC_URI += "file://Makefile \
+           file://obmc-phosphor-fand.c \
+           "
-- 
2.6.0