diff options
author | Adriana Kobylak <anoo@us.ibm.com> | 2019-05-09 19:44:47 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-05-10 04:17:22 +0300 |
commit | 0043501620900ef133b21782c9239c092001766b (patch) | |
tree | 5819c4be957e6fb8ea4cebab1970dc646e70865d | |
parent | 620c2800d3d61972324d89bf041e3fc55be64797 (diff) | |
download | openbmc-0043501620900ef133b21782c9239c092001766b.tar.xz |
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>
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb | 40 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift-avsbus-disable.sh) | 0 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift-avsbus-enable.sh) | 0 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/power-workarounds.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift-power-workarounds.sh) | 0 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon-avsbus-disable.sh) | 0 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon-avsbus-enable.sh) | 0 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/power-workarounds.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon-power-workarounds.sh) | 0 |
7 files changed, 7 insertions, 33 deletions
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 414d0b83e..498b622d9 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 @@ inherit obmc-phosphor-systemd 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-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift-avsbus-disable.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh index 1228ff945..1228ff945 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift-avsbus-disable.sh +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-disable.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift-avsbus-enable.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh index d3840910a..d3840910a 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift-avsbus-enable.sh +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift-power-workarounds.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/power-workarounds.sh index dc1f4803b..dc1f4803b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift-power-workarounds.sh +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/power-workarounds.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon-avsbus-disable.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable.sh index a158f159e..a158f159e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon-avsbus-disable.sh +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon-avsbus-enable.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable.sh index 6306c58b0..6306c58b0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon-avsbus-enable.sh +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon-power-workarounds.sh b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/power-workarounds.sh index d40579731..d40579731 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon-power-workarounds.sh +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/power-workarounds.sh |