From 7bcff9c6853b4090576534cc4e51fd3e5ad2d7f9 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 9 May 2019 18:02:32 -0400 Subject: meta-openpower: 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-openpower rev: 6e889e3889a474e481dc78890696b922a3bbbafc) Change-Id: I3607828dea6bd16b457ce3de3a26320ac8525f66 Signed-off-by: Brad Bishop --- meta-openpower/recipes-bsp/skiboot/skiboot.inc | 2 +- .../recipes-phosphor/flash/phosphor-software-manager_%.bbappend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-openpower/recipes-bsp/skiboot/skiboot.inc b/meta-openpower/recipes-bsp/skiboot/skiboot.inc index ab455b0eb1..51d089ee98 100644 --- a/meta-openpower/recipes-bsp/skiboot/skiboot.inc +++ b/meta-openpower/recipes-bsp/skiboot/skiboot.inc @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0" SRC_URI += "git://github.com/open-power/skiboot.git" SRC_URI += "file://0001-libffs-fix-gcc8-stringop-truncation-warnings.patch" -FILESEXTRAPATHS_append := "${THISDIR}/skiboot:" +FILESEXTRAPATHS_prepend := "${THISDIR}/skiboot:" LIC_FILES_CHKSUM = "file://${S}/LICENCE;md5=3b83ef96387f14655fc854ddc3c6bd57" diff --git a/meta-openpower/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-openpower/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index e873e998e2..4f2ea98535 100644 --- a/meta-openpower/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-openpower/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_append_df-openpower := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_df-openpower := "${THISDIR}/${PN}:" SYSTEMD_OVERRIDE_${PN}-updater_append_df-openpower = \ " software-bmc-updater.conf:xyz.openbmc_project.Software.BMC.Updater.service.d/software-bmc-updater.conf" -- cgit v1.2.3