diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-20 19:17:44 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-10 21:26:33 +0300 |
commit | 2d70fcc97fa893393778a50414ef13c341d92b2e (patch) | |
tree | a966cb71148891854c6e8ac8a5b060fec45db65c /meta-ibm/meta-witherspoon/recipes-phosphor/fans | |
parent | a5f2fd4705fa685a1ba03705ab7fafecb6090385 (diff) | |
download | openbmc-2d70fcc97fa893393778a50414ef13c341d92b2e.tar.xz |
spoon: Remove wildcards from fan recipe appends
The intent of the wildcards was to match the base recipe
irrespective of version but you don't need the wildcard
to do that. Simply use the recipe name without the version
to match any version of the base recipe.
With the wildcards phosphor-fan%.bbappend for instance
matched every recipe that starts with phosphor-fan causing
strange build warnings like:
invalid packageconfig cooling-type
while building some of the native fan configuration recipes.
Tested: Built a Witherspoon image
(From meta-ibm rev: 56b4d017ce31e686694eb0b304acd6bb9a1d460e)
Change-Id: I83549464086178956405096dcec2729235e4897f
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/fans')
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%.bbappend) | 0 | ||||
-rwxr-xr-x | meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%/config.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-monitor.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/obmc/phosphor-fan/phosphor-cooling-type-0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service) | 0 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend) | 0 |
9 files changed, 0 insertions, 0 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend index 72d991c7e..72d991c7e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml index a70ac85a3..a70ac85a3 100755 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend index 72d991c7e..72d991c7e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%/config.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml index c5be29c1e..c5be29c1e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native%/config.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config-native/config.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf index 90b1e810e..90b1e810e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-monitor.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf index 023e61a64..023e61a64 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-monitor.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/obmc/phosphor-fan/phosphor-cooling-type-0.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf index e5e8f435e..e5e8f435e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/obmc/phosphor-fan/phosphor-cooling-type-0.conf +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service index 9086efb77..9086efb77 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend index 8cc310e7c..8cc310e7c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend |