meta-yocto: FILESEXTRAPATHS_prepend := in all bbappends

PATCH Applied Paul Eggleton 3 participants 4 messages Jun 10, 2011 – Jun 15, 2011

lore

Share & tools

lore

Paul Eggleton

author

2011-06-10 17:43 UTC #0 lore raw

cover meta-yocto: FILESEXTRAPATHS_prepend := in all bbappends

The following changes since commit b30cb584a738915113e88b7db1028d53b2bae5f9:

Revert "gcc: rebase the patch to avoid patch rejection" (2011-06-10 13:30:28 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib paule/filespath
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/filespath

Paul Eggleton (1):
meta-yocto: use FILESEXTRAPATHS_prepend := in all bbappends

 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    4 +---
 .../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(-)

Signature · 1 line

1.7.4.1

Paul Eggleton

author

2011-06-10 17:43 UTC #1 lore raw

PATCH 1/1 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 <[email protected]>

---
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    4 +---
 .../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(-)

meta-yocto/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -3

index 4b8d0e6..72d991c 100644
@@ -1,3 +1 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
-
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

meta-yocto/recipes-core/netbase/netbase_4.45.bbappend +1 -3

index 4b8d0e6..72d991c 100644
@@ -1,3 +1 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
-
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

meta-yocto/recipes-core/uclibc/uclibc_git.bbappend +1 -3

index 4b8d0e6..72d991c 100644
@@ -1,3 +1 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
-
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +1 -3

index 4b8d0e6..72d991c 100644
@@ -1,3 +1 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
-
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

Signature · 1 line

1.7.4.1

Darren Hart

Acked-by on v1 1/1

2011-06-10 18:20 UTC #2 lore raw

Re: [PATCH 1/1] meta-yocto: use FILESEXTRAPATHS_prepend := in all bbappends

Thanks Paul!

Quoted 9 lines · Paul Eggleton

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 <[email protected]>

Acked-by Darren Hart <[email protected]>

Quoted 43 lines

---
 .../recipes-bsp/formfactor/formfactor_0.0.bbappend |    4 +---
 .../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(-)

meta-yocto/recipes-bsp/formfactor/formfactor_0.0.bbappend +1 -3

index 4b8d0e6..72d991c 100644
@@ -1,3 +1 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
-
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

meta-yocto/recipes-core/netbase/netbase_4.45.bbappend +1 -3

index 4b8d0e6..72d991c 100644
@@ -1,3 +1 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
-
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

meta-yocto/recipes-core/uclibc/uclibc_git.bbappend +1 -3

index 4b8d0e6..72d991c 100644
@@ -1,3 +1 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
-
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

meta-yocto/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +1 -3

index 4b8d0e6..72d991c 100644
@@ -1,3 +1 @@
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
-
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Richard Purdie

Applied

2011-06-15 10:50 UTC #3 lore raw

In reply to Paul Eggleton

Quoted 10 lines · Paul Eggleton

The following changes since commit b30cb584a738915113e88b7db1028d53b2bae5f9:
Revert "gcc: rebase the patch to avoid patch rejection" (2011-06-10 13:30:28 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib paule/filespath
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/filespath
Paul Eggleton (1):
meta-yocto: use FILESEXTRAPATHS_prepend := in all bbappends

Merged to master, thanks.

Richard