commit 0043501620900ef133b21782c9239c092001766b
author Adriana Kobylak <anoo@us.ibm.com> Thu May 09 11:44:47 2019 -0500
committer Brad Bishop <bradleyb@fuzziesquirrel.com> Thu May 09 21:17:22 2019 -0400
tree 5819c4be957e6fb8ea4cebab1970dc646e70865d
parent 620c2800d3d61972324d89bf041e3fc55be64797

meta-ibm: avsbus-control: Create machine-specific structure

Yocto automatically adds files/<MACHINE>/ to the file path, take
advantage of this feature to simplify the recipe and directory
structure.

Tested: Built witherspoon, witherspoon-128, and swift, and verified
        they all had the correct avsbus-control script in their image.

(From meta-ibm rev: cd6c8359c35986169e3225f853e38fabb7aade1b)

Change-Id: Id4051ebceef1bee6898d8637381970ba31dc9508
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb

diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb
index 414d0b8..498b622 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb
@@ -8,42 +8,16 @@
 RDEPENDS_${PN} += "i2c-tools"
 
 S = "${WORKDIR}"
-SRC_URI_append_swift = " file://swift-avsbus-disable.sh"
-SRC_URI_append_swift = " file://swift-avsbus-enable.sh"
-SRC_URI_append_swift = " file://swift-power-workarounds.sh"
-SRC_URI_append_witherspoon = " file://witherspoon-avsbus-disable.sh"
-SRC_URI_append_witherspoon = " file://witherspoon-avsbus-enable.sh"
-SRC_URI_append_witherspoon = " file://witherspoon-power-workarounds.sh"
-SRC_URI_append_witherspoon-128 = " file://witherspoon-avsbus-disable.sh"
-SRC_URI_append_witherspoon-128 = " file://witherspoon-avsbus-enable.sh"
-SRC_URI_append_witherspoon-128 = " file://witherspoon-power-workarounds.sh"
+
+SRC_URI += "file://avsbus-disable.sh \
+            file://avsbus-enable.sh \
+            file://power-workarounds.sh"
 
 do_install() {
         install -d ${D}${bindir}
-}
-do_install_append_swift() {
-        install -m 0755 ${WORKDIR}/swift-avsbus-disable.sh \
-            ${D}${bindir}/avsbus-disable.sh
-        install -m 0755 ${WORKDIR}/swift-avsbus-enable.sh \
-            ${D}${bindir}/avsbus-enable.sh
-        install -m 0755 ${WORKDIR}/swift-power-workarounds.sh \
-            ${D}${bindir}/power-workarounds.sh
-}
-do_install_append_witherspoon() {
-        install -m 0755 ${WORKDIR}/witherspoon-avsbus-disable.sh \
-            ${D}${bindir}/avsbus-disable.sh
-        install -m 0755 ${WORKDIR}/witherspoon-avsbus-enable.sh \
-            ${D}${bindir}/avsbus-enable.sh
-        install -m 0755 ${WORKDIR}/witherspoon-power-workarounds.sh \
-            ${D}${bindir}/power-workarounds.sh
-}
-do_install_append_witherspoon-128() {
-        install -m 0755 ${WORKDIR}/witherspoon-avsbus-disable.sh \
-            ${D}${bindir}/avsbus-disable.sh
-        install -m 0755 ${WORKDIR}/witherspoon-avsbus-enable.sh \
-            ${D}${bindir}/avsbus-enable.sh
-        install -m 0755 ${WORKDIR}/witherspoon-power-workarounds.sh \
-            ${D}${bindir}/power-workarounds.sh
+        install -m 0755 ${S}/avsbus-disable.sh ${D}${bindir}/avsbus-disable.sh
+        install -m 0755 ${S}/avsbus-enable.sh ${D}${bindir}/avsbus-enable.sh
+        install -m 0755 ${S}/power-workarounds.sh ${D}${bindir}/power-workarounds.sh
 }
 
 TMPL_EN= "avsbus-enable@.service"