commit | c828be02d177ece43006329ee99ca4d2ef733c58 | [log] [tgz] |
---|---|---|
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Tue Apr 30 12:46:42 2019 -0400 |
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Thu May 09 21:30:28 2019 -0400 |
tree | 85681b491219e7057c206c0b564bb62a3be18c7c | |
parent | 1de2e7044a1c0fab64209be316f19cb8cd199e35 [diff] |
meta-ibm: witherspoon: fix up bbappend wildcards A number of bbappend wildcards matched more than what was desired. Reduce the scope accordingly. phosphor-dbus-monitor-config-native%.bbappend -> phosphor-dbus-monitor-config-native.bbappend phosphor-ipmi-fru-read-bmc-inventory%.bbappend -> phosphor-ipmi-fru-read-bmc-inventory-native.bbappend phosphor-ipmi-fru-read-bmc-inventory%/bmc-fru-config.yaml -> phosphor-ipmi-fru-read-bmc-inventory-native/bmc-fru-config.yaml phosphor-ipmi-fru-read-not-sent-by-host-inventory%.bbappend -> phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bbappend obmc-op-control-power%.bbappend -> obmc-op-control-power_%.bbappend Tested: bitbake-layers show-appends still shows the witherspoon bbappends Change-Id: Iee7f55ee23f8b93dde76cd862f777d0a2ab8c733 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power%.bbappend b/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend similarity index 100% rename from meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power%.bbappend rename to meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend
diff --git a/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power%/obmc/power_control b/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%/obmc/power_control similarity index 100% rename from meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power%/obmc/power_control rename to meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%/obmc/power_control
diff --git a/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native%.bbappend b/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bbappend similarity index 100% rename from meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native%.bbappend rename to meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bbappend
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bbappend similarity index 100% rename from meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend rename to meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native.bbappend
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%/bmc-fru-config.yaml b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native/bmc-fru-config.yaml similarity index 100% rename from meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%/bmc-fru-config.yaml rename to meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory-native/bmc-fru-config.yaml
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%.bbappend deleted file mode 100644 index 72d991c..0000000 --- a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%.bbappend +++ /dev/null
@@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bbappend similarity index 100% copy from meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend copy to meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native.bbappend
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%/fru-config-not-sent-by-host.yaml b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native/fru-config-not-sent-by-host.yaml similarity index 100% rename from meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory%/fru-config-not-sent-by-host.yaml rename to meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-not-sent-by-host-inventory-native/fru-config-not-sent-by-host.yaml