| commit | 09494ec728d325e14606c8168269dd1fc5e590f1 | [log] [tgz] |
|---|---|---|
| author | Brad Bishop <bradleyb@us.ibm.com> | Sun Oct 18 22:21:04 2015 -0400 |
| committer | Brad Bishop <bradleyb@us.ibm.com> | Sun Oct 18 22:21:04 2015 -0400 |
| tree | 38e7c7d009a552926b5cc103f92452b7bc328d59 | |
| parent | 51607d2c0383ff341bcd348b015d3fa8fb76c3f0 [diff] |
Remove S and SRC_URI from c daemon class 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.
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-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 @@ 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 @@ 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 \ + "