From 2df9cbeb2f6dadb15ae2b35bc6738898441c8bb6 Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Sun, 2 Jan 2005 00:40:06 +0000
Subject: Merge bk://oe-devel.bkbits.net/openembedded into
 bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/02 00:29:40+00:00 nexus.co.uk!pb
remove gweled from gpe-games one more time

2005/01/02 00:27:53+00:00 nexus.co.uk!pb
add gpe-soundbite to task-gpe-apps.  remove useless miniclipboard.

2005/01/02 00:26:33+00:00 nexus.co.uk!pb
patch libsvg to use expat rather than libxml2


2005/01/02 00:22:09+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded

2005/01/02 00:21:52+00:00 (none)!cwiiis
Bump PR on gpe-session-scripts (and a mvdir back and forth, sorry)

2005/01/02 00:18:53+00:00 (none)!cwiiis
Merge

2005/01/02 00:08:17+00:00 (none)!cwiiis
Add collie key-mappings.

2005/01/02 00:03:14+00:00 (none)!cwiiis
Complete move of gpe-task-games to meta-gpe.

2005/01/02 00:50:26+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/02 00:50:13+01:00 uni-frankfurt.de!mickeyl
upgrade wlan-ng to 0.2.1pre23 and reset PACKAGE_ARCH for the utils packages. this .bb looks pretty suboptimal, splitting it up into a modules and a utils .bb would be useful

2005/01/01 19:23:45+01:00 uni-frankfurt.de!mickeyl
s/collie-fl/sharp_fl/ in devices initscript

BKrev: 41d742e6y8_hdUO3hSBlG_tQVPYNiw
---
 packages/gpe-session-scripts/files/collie.xmodmap        |  0
 packages/gpe-session-scripts/files/keymap.sh             | 16 ++++++++++++++++
 packages/gpe-session-scripts/gpe-session-scripts_0.62.bb |  7 ++++---
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 packages/gpe-session-scripts/files/collie.xmodmap

(limited to 'packages/gpe-session-scripts')

diff --git a/packages/gpe-session-scripts/files/collie.xmodmap b/packages/gpe-session-scripts/files/collie.xmodmap
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gpe-session-scripts/files/keymap.sh b/packages/gpe-session-scripts/files/keymap.sh
index e69de29bb2..3f2910b439 100644
--- a/packages/gpe-session-scripts/files/keymap.sh
+++ b/packages/gpe-session-scripts/files/keymap.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo`
+
+case $MACHINE in
+	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+		xmodmap - < /etc/X11/shepherd.xmodmap
+		;;
+        "Sharp-Collie"
+                xmodmap - < /etc/X11/collie.xmodmap
+                ;;
+	"Simpad")
+		xmodmap - < /etc/X11/simpad.xmodmap
+		;;
+esac
+
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
index 4420012098..9996e57f28 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
@@ -1,5 +1,5 @@
 LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
 
 inherit gpe
 
@@ -16,12 +16,13 @@ SRC_URI += "file://zaurus.sh \
 	file://change-default-applets.patch;patch=1 \
 	file://xdefaults.patch;patch=1 \
 	file://matchbox-session \
-	file://shepherd.xmodmap file://simpad.xmodmap"
+	file://shepherd.xmodmap file://simpad.xmodmap \
+	file://collie.xmodmap"
 
 do_install_append() {
 	install ${WORKDIR}/zaurus.sh ${D}/etc/X11/Xinit.d/11zaurus
 	install ${WORKDIR}/keymap.sh ${D}/etc/X11/Xinit.d/12keymap
-	for m in simpad shepherd; do
+	for m in simpad shepherd collie; do
 		install -m 0644 ${WORKDIR}/$m.xmodmap ${D}/etc/X11/
 	done
 	install -d ${D}/etc/gpe/xsettings-default.d
-- 
cgit v1.2.3