| commit | cd6c8359c35986169e3225f853e38fabb7aade1b | [log] [tgz] |
|---|---|---|
| author | Adriana Kobylak <anoo@us.ibm.com> | Thu May 09 11:44:47 2019 -0500 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Fri May 10 01:10:44 2019 +0000 |
| tree | 49adf1b62f1b58cfe47a327a642003f70e22a6dc | |
| parent | 6f44bb26247289aa46c6d21f04617838e596294a [diff] |
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.
Change-Id: Ia5e1d8a42f5b3c5e2e24245a821595dc1aa7309a
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb index 414d0b8..498b622 100644 --- a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb +++ b/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"
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift-avsbus-disable.sh b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh similarity index 100% rename from meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift-avsbus-disable.sh rename to meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift-avsbus-enable.sh b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh similarity index 100% rename from meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift-avsbus-enable.sh rename to meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift-power-workarounds.sh b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/power-workarounds.sh similarity index 100% rename from meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift-power-workarounds.sh rename to meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/power-workarounds.sh
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon-avsbus-disable.sh b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable.sh similarity index 100% rename from meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon-avsbus-disable.sh rename to meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable.sh
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon-avsbus-enable.sh b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable.sh similarity index 100% rename from meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon-avsbus-enable.sh rename to meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable.sh
diff --git a/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon-power-workarounds.sh b/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/power-workarounds.sh similarity index 100% rename from meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon-power-workarounds.sh rename to meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/power-workarounds.sh