commit | a588016cb556b425a00286ace2c8324590aac98b | [log] [tgz] |
---|---|---|
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Thu May 09 17:09:20 2019 -0400 |
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Mon May 13 20:54:36 2019 +0000 |
tree | 0da3d9b85c95e2d6fc122ed412075fb030074a1e | |
parent | d383ecde351fa80ff94fd7220b951e6458bdda2b [diff] |
meta-ibm: witherspoon: fix file search paths Typically it does not make any sense to append to FILESEXTRAPATHS. FILESEXTRAPATHS is set in a bbappend when overriding something from another layer. The typical desire will be to make bitbake search for files in the layer with the bbappend and not some other layer earlier in the priority list. Further, appending to FILESEXTRAPATHS will introduce unexpected behavior when multiple layers append the same recipe - layers with higher layer priorities that append to FILESEXTRAPATHS will find their files overriden by files in layers with lower priorities. Change-Id: Idd40e482006cf5bed9f52dd3ed9be83cd067abef Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend index bc6ea80..a3fc74e 100644 --- a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend
@@ -1,4 +1,4 @@ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" # Package configuration FAN_PACKAGES += " \
diff --git a/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 0fa1105..f5a3582 100644 --- a/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
@@ -1,4 +1,4 @@ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service" INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service"
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 02b1b53..eec3999 100644 --- a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,4 +1,4 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append = " \ file://occ_sensors.hardcoded.yaml \ file://hwmon_sensors.hardcoded.yaml \
diff --git a/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 71a5836..02c0e94 100644 --- a/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
@@ -1,2 +1,2 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append = " file://TPMEnable-default-true.override.yml"