diff options
author | Brad Bishop <bradleyb@us.ibm.com> | 2015-10-18 22:00:15 -0400 |
---|---|---|
committer | Brad Bishop <bradleyb@us.ibm.com> | 2015-10-18 22:00:15 -0400 |
commit | 51607d2c0383ff341bcd348b015d3fa8fb76c3f0 (patch) | |
tree | 9e7622d58297960b4468c6a520154c56b0e566d6 | |
parent | fe42c9d5e8afc9023d4fd5c0754a941164985375 (diff) | |
download | talos-openbmc-51607d2c0383ff341bcd348b015d3fa8fb76c3f0.tar.gz talos-openbmc-51607d2c0383ff341bcd348b015d3fa8fb76c3f0.zip |
Remove S and SRC_URI from python 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.
8 files changed, 24 insertions, 6 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-py-daemon.bbclass b/meta-phosphor/classes/obmc-phosphor-py-daemon.bbclass index 35c271415..9cb8bfdba 100644 --- a/meta-phosphor/classes/obmc-phosphor-py-daemon.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-py-daemon.bbclass @@ -5,13 +5,11 @@ inherit obmc-phosphor-systemd inherit obmc-phosphor-license RDEPENDS_${PN} += "python-dbus python-pygobject" -SRC_URI += " \ - file://${PN}.py \ - " -S = "${WORKDIR}" +INSTALL_NAME ?= "${PN}" +SCRIPT_NAME ?= "${INSTALL_NAME}.py" do_install_append() { # install the script install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/${PN}.py ${D}${sbindir}/${PN} + install -m 0755 ${S}/${SCRIPT_NAME} ${D}${sbindir}/${INSTALL_NAME} } diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb index ad642a331..d7a8ed998 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-chassis/obmc-phosphor-chassisd.bb @@ -4,3 +4,6 @@ PR = "r1" inherit obmc-phosphor-chassis-mgmt inherit obmc-phosphor-pydbus-service + +S = "${WORKDIR}" +SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-eventd.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-eventd.bb index 998648c40..b5a54da3f 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-eventd.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-event/obmc-phosphor-eventd.bb @@ -4,3 +4,6 @@ PR = "r1" inherit obmc-phosphor-event-mgmt inherit obmc-phosphor-pydbus-service + +S = "${WORKDIR}" +SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb index c140c9be6..1446a7313 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-example-pydbus/obmc-phosphor-example-pydbus.bb @@ -11,8 +11,10 @@ inherit obmc-phosphor-pydbus-service client = "pyclient-sample" SRC_URI += "file://${client}.py" +SRC_URI += "file://${PN}.py" +S = "${WORKDIR}" do_install_append() { install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/${client}.py ${D}${bindir}/${client} + install -m 0755 ${S}/${client}.py ${D}${bindir}/${client} } diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb index bd4b1af1f..6e4c04a25 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-flash/obmc-phosphor-flashd.bb @@ -4,3 +4,6 @@ PR = "r1" inherit obmc-phosphor-flash-mgmt inherit obmc-phosphor-pydbus-service + +S = "${WORKDIR}" +SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb index 664760e12..05471d52f 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-policy/obmc-phosphor-policyd.bb @@ -4,3 +4,6 @@ PR = "r1" inherit obmc-phosphor-policy-mgmt inherit obmc-phosphor-pydbus-service + +S = "${WORKDIR}" +SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb index fc646a52f..7a82fb5bc 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sensor/obmc-phosphor-sensord.bb @@ -4,3 +4,6 @@ PR = "r1" inherit obmc-phosphor-sensor-mgmt inherit obmc-phosphor-pydbus-service + +S = "${WORKDIR}" +SRC_URI += "file://${PN}.py" diff --git a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb index 3dc9a64e3..bcb5d32ad 100644 --- a/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb +++ b/meta-phosphor/common/recipes-phosphor/obmc-phosphor-sys/obmc-phosphor-sysd.bb @@ -4,3 +4,6 @@ PR = "r1" inherit obmc-phosphor-system-mgmt inherit obmc-phosphor-pydbus-service + +S = "${WORKDIR}" +SRC_URI += "file://${PN}.py" |