From e1f6ebba3ab2fc8a469c1d96fc6d4c4b8f16845c Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 10 Jun 2011 18:43:52 +0100 Subject: [PATCH] meta-yocto: use FILESEXTRAPATHS_prepend := in all bbappends Using FILESEXTRAPATHS is cleaner than the old FILESPATH-based method, and as meta-intel layers are using FILESEXTRAPATHS their formfactor bbappends will now work. In addition I have used FILESEXTRAPATHS_prepend which is not absolutely necessary, but provides a good working example in case it is copied by other layers that are intended to be used on top of it. Fixes [YOCTO #1156] Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta-yocto/recipes-bsp/formfactor/formfactor_0.0.bbappend | 4 +--- meta-yocto/recipes-core/netbase/netbase_4.45.bbappend | 4 +--- meta-yocto/recipes-core/uclibc/uclibc_git.bbappend | 4 +--- .../xorg-xserver/xserver-xf86-config_0.1.bbappend | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/meta-yocto/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-yocto/recipes-bsp/formfactor/formfactor_0.0.bbappend index 4b8d0e656b..72d991c7e5 100644 --- a/meta-yocto/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ b/meta-yocto/recipes-bsp/formfactor/formfactor_0.0.bbappend @@ -1,3 +1 @@ -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:" - +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-yocto/recipes-core/netbase/netbase_4.45.bbappend b/meta-yocto/recipes-core/netbase/netbase_4.45.bbappend index 4b8d0e656b..72d991c7e5 100644 --- a/meta-yocto/recipes-core/netbase/netbase_4.45.bbappend +++ b/meta-yocto/recipes-core/netbase/netbase_4.45.bbappend @@ -1,3 +1 @@ -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:" - +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-yocto/recipes-core/uclibc/uclibc_git.bbappend b/meta-yocto/recipes-core/uclibc/uclibc_git.bbappend index 4b8d0e656b..72d991c7e5 100644 --- a/meta-yocto/recipes-core/uclibc/uclibc_git.bbappend +++ b/meta-yocto/recipes-core/uclibc/uclibc_git.bbappend @@ -1,3 +1 @@ -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:" - +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend index 4b8d0e656b..72d991c7e5 100644 --- a/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +++ b/meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend @@ -1,3 +1 @@ -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:" - +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"