From 91a5b96208f739ab8448081f2c895f80a92412b1 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 22 Mar 2006 15:07:03 +0000
Subject: Add LTTng packages

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@323 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../xserver-kdrive-common/etc/X11/Xinit.d/30xTs_Calibrate         | 6 +++---
 .../xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver   | 2 ++
 .../packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb   | 2 +-
 openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb  | 2 +-
 .../packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm | 8 ++++----
 5 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'openembedded/packages/xserver-kdrive-common')

diff --git a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/30xTs_Calibrate b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/30xTs_Calibrate
index de47b871a..793672eb6 100644
--- a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/30xTs_Calibrate
+++ b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xinit.d/30xTs_Calibrate
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ ! -f /etc/pointercal ]; then
-    /usr/bin/xtscal
-fi
+#if [ ! -f /etc/pointercal ]; then
+#    /usr/bin/xtscal
+#fi
 
diff --git a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
index 49ee0cf58..88b8abbb2 100644
--- a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
+++ b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xserver
@@ -68,6 +68,8 @@ case `module_id` in
 		ARGS="$ARGS -rgba rgb" ;;
 	"Generic OMAP1510/1610/1710")
 		ARGS="$ARGS -mouse /dev/input/event0" ;;
+	"ARM-IntegratorCP")
+		ARGS="$ARGS -rgba vrgb"
 esac
 
 exec $XSERVER $ARGS $*
diff --git a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index 16ac1049b..e1dee0faa 100644
--- a/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/openembedded/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
diff --git a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb
index 3ea41de7f..633f54611 100644
--- a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb
+++ b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
 LICENSE = "GPL"
 SECTION = "x11"
 PRIORITY = "optional"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "file://xserver-nodm"
 S = ${WORKDIR}
diff --git a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
index dcafb9e98..0f64b6c11 100755
--- a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
+++ b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
@@ -14,10 +14,10 @@ case "$1" in
        /etc/X11/Xserver &
        export DISPLAY=:0
 	       
-       while [ ! -f /etc/pointercal ]
-       do
-               /usr/bin/xtscal
-       done
+#       while [ ! -f /etc/pointercal ]
+#       do
+#               /usr/bin/xtscal
+#       done
 
        /etc/X11/Xsession &
   ;;
-- 
cgit v1.2.3