From: Richard Purdie <rpurdie@rpsys.net>
Date: Wed, 9 Mar 2005 10:26:26 +0000 (+0000)
Subject: gpe-session-scripts: Only use the xmodmap file for 2.4 kernels on c7x0
X-Git-Tag: Release-2010-05/1~14705
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b27bae6eac796b4834b64cad9aaf9d9477c1053;p=openembedded.git

gpe-session-scripts: Only use the xmodmap file for 2.4 kernels on c7x0

BKrev: 422ecf52_q-qVdaDJ88du8r5JviFqA
---

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 0ce6424594..a8469e06ed 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -89,6 +89,7 @@ red@quarm.(none)
 reenoo@sugarcube.dyndns.org
 rjt@bob.cambridgebroadband.com
 rjt@flotta.cambridgebroadband.com
+root@darkstar.example.net
 root@tim.rpsys.net
 roy@rant-central.com
 rwhitby@home.(none)
diff --git a/packages/gpe-session-scripts/files/keymap.sh b/packages/gpe-session-scripts/files/keymap.sh
index a34e91ffb1..0e64aac9f4 100644
--- a/packages/gpe-session-scripts/files/keymap.sh
+++ b/packages/gpe-session-scripts/files/keymap.sh
@@ -4,7 +4,11 @@ MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo`
 
 case $MACHINE in
 	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
-		xmodmap - < /etc/X11/shepherd.xmodmap
+		case `uname -r` in
+			2.4*)
+				xmodmap - < /etc/X11/shepherd.xmodmap
+				;;
+			esac
 		;;
         "Sharp-Collie")
                 xmodmap - < /etc/X11/collie.xmodmap