From 90ac746dcd9a03eb49d02ad2236198f95db91f9e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 22 Jul 2010 15:24:43 +0100 Subject: xserver-xf86-config: Fix emenlow append to coexist with existing users Signed-off-by: Richard Purdie --- .../xorg-xserver/xserver-xf86-config/emenlow/xorg.conf | 13 +++++++++++++ .../packages/xorg-xserver/xserver-xf86-config/xorg.conf | 13 ------------- .../packages/xorg-xserver/xserver-xf86-config_0.1.bbappend | 4 +++- 3 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 meta-emenlow/packages/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf delete mode 100644 meta-emenlow/packages/xorg-xserver/xserver-xf86-config/xorg.conf diff --git a/meta-emenlow/packages/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf b/meta-emenlow/packages/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf new file mode 100644 index 000000000..684626383 --- /dev/null +++ b/meta-emenlow/packages/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf @@ -0,0 +1,13 @@ +Section "ServerFlags" + Option "AutoAddDevices" "False" +EndSection + +Section "Device" + Identifier "Configured Video Device" + Driver "psb" + Option "ShadowFB" "False" +EndSection + +Section "DRI" + Mode 0666 +EndSection diff --git a/meta-emenlow/packages/xorg-xserver/xserver-xf86-config/xorg.conf b/meta-emenlow/packages/xorg-xserver/xserver-xf86-config/xorg.conf deleted file mode 100644 index 684626383..000000000 --- a/meta-emenlow/packages/xorg-xserver/xserver-xf86-config/xorg.conf +++ /dev/null @@ -1,13 +0,0 @@ -Section "ServerFlags" - Option "AutoAddDevices" "False" -EndSection - -Section "Device" - Identifier "Configured Video Device" - Driver "psb" - Option "ShadowFB" "False" -EndSection - -Section "DRI" - Mode 0666 -EndSection diff --git a/meta-emenlow/packages/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-emenlow/packages/xorg-xserver/xserver-xf86-config_0.1.bbappend index 1e9c3789e..4b8d0e656 100644 --- a/meta-emenlow/packages/xorg-xserver/xserver-xf86-config_0.1.bbappend +++ b/meta-emenlow/packages/xorg-xserver/xserver-xf86-config_0.1.bbappend @@ -1 +1,3 @@ -FILESPATH := "${FILESPATH}:${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" +FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:" + -- cgit v1.2.3