From 30217a527db0b1427fc482c2f44552461f208831 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Thu, 9 May 2019 17:09:20 -0400
Subject: 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.

(From meta-ibm rev: a588016cb556b425a00286ace2c8324590aac98b)

Change-Id: I7672219fdab5e2c9cc03423d7f507ef2e6a842c2
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend       | 2 +-
 meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend | 2 +-
 .../recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend              | 2 +-
 .../recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend                 | 2 +-
 .../recipes-phosphor/settings/phosphor-settings-manager_%.bbappend      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend
index 847714b38..62ea76f79 100644
--- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += "file://journald-storage-policy.conf"
 SRC_URI += "file://systemd-journald-override.conf"
 SRC_URI += "file://journald-size-policy.conf"
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 bc6ea802e..a3fc74ea0 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend
+++ b/meta-ibm/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-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
index 0fa11050b..f5a358200 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend
+++ b/meta-ibm/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-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 02b1b5371..eec3999f2 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-ibm/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-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
index 71a583690..02c0e94b4 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend
+++ b/meta-ibm/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"
-- 
cgit v1.2.3