yocto-bsp: fix for xserver-xorg-config bbappend FILESPATH

From: Tom Zanussi <[email protected]>

This patchset fixes Yocto bug Bug 3158 [xserver-xorg-config_0.1.bbappend bsp FILESPATH not set in a robust manner].

It also removes a few 'test' config options left in a couple of the machine templates.

The following changes since commit 7c39c87d52c20e47cf90275a16e4517a296c8388:

documentation: adt-manual, yocto-project-qs - Added tarball installer info (2012-09-28 17:54:28 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib.git tzanussi/yocto-bsp-filesextrapaths
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=tzanussi/yocto-bsp-filesextrapaths

Tom Zanussi (2):
yocto-bsp: use FILESEXTRAPATHS for xserver-xf86-config bbappends
yocto-bsp: remove 'test' options from user-config.cfg

 .../{{ if xserver == \"y\": }} xserver-xf86-config_0.1.bbappend"      | 4 +---
 .../{{ if xserver == \"y\": }} xserver-xf86-config_0.1.bbappend"      | 4 +---
 .../target/arch/powerpc/recipes-kernel/linux/files/user-config.cfg    | 4 ----
 .../recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend    | 3 +--
 .../target/arch/qemu/recipes-kernel/linux/files/user-config.cfg       | 4 ----
 .../{{ if xserver == \"y\": }} xserver-xf86-config_0.1.bbappend"      | 4 +---
 6 files changed, 4 insertions(+), 19 deletions(-)

1.7.11.4

From: Tom Zanussi <[email protected]>

The xserver-xf86-config .bbappends are still using FILESPATH - update them to use FILESEXTRAPATHS as recommended by the Poky Reference Manual and BSP Developer's Guides.

---
 .../{{ if xserver == \"y\": }} xserver-xf86-config_0.1.bbappend"      | 4 +---
 .../{{ if xserver == \"y\": }} xserver-xf86-config_0.1.bbappend"      | 4 +---
 .../recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend    | 3 +--
 .../{{ if xserver == \"y\": }} xserver-xf86-config_0.1.bbappend"      | 4 +---
 4 files changed, 4 insertions(+), 11 deletions(-)

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}:"

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}:"

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

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}:"

1.7.11.4

From: Tom Zanussi <[email protected]>

A couple bsp templates have some options that were used for testing but aren't needed for any other reason - remove them.

---
 .../target/arch/powerpc/recipes-kernel/linux/files/user-config.cfg    | 4 ----
 .../target/arch/qemu/recipes-kernel/linux/files/user-config.cfg       | 4 ----
 2 files changed, 8 deletions(-)

index 2ee921b..e69de29 100644
@@ -1,4 +0,0 @@
-CONFIG_FTRACE_SYSCALLS=y
-CONFIG_SCHED_TRACER=y
-CONFIG_IRQSOFF_TRACER=y
-CONFIG_PREEMPT_TRACER=y

index 2ee921b..e69de29 100644
@@ -1,4 +0,0 @@
-CONFIG_FTRACE_SYSCALLS=y
-CONFIG_SCHED_TRACER=y
-CONFIG_IRQSOFF_TRACER=y
-CONFIG_PREEMPT_TRACER=y

1.7.11.4

Merged into Poky Master

Thanks
Sau!