[oe-commits] org.oe.dev xserver-common: move fallback keymap into case statement

[koen commit]

xserver-common: move fallback keymap into case statement

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: bb0dc92865e350f18a68876ae23080e37b6c85d8
ViewMTN: http://monotone.openembedded.org/revision/info/bb0dc92865e350f18a68876ae23080e37b6c85d8
Files:
1
packages/xserver-common/files/kdrive-1.4-fixes-fix.patch
packages/xserver-common/xserver-common_1.22.bb
Diffs:

#
# mt diff -r34075c44f79b794ed2981519e10e09536407704f -rbb0dc92865e350f18a68876ae23080e37b6c85d8
#
#
#
# add_file "packages/xserver-common/files/kdrive-1.4-fixes-fix.patch"
#  content [5be32d2bfb0656f741e600e0a68970be43f17507]
# 
# patch "packages/xserver-common/xserver-common_1.22.bb"
#  from [8752f199e55d1213507046c386dc15d5f4cf3a0c]
#    to [bfa048d518a53a0b613f50d7dabcaad5aeeec33b]
#
============================================================
--- packages/xserver-common/files/kdrive-1.4-fixes-fix.patch	5be32d2bfb0656f741e600e0a68970be43f17507
+++ packages/xserver-common/files/kdrive-1.4-fixes-fix.patch	5be32d2bfb0656f741e600e0a68970be43f17507
@@ -0,0 +1,22 @@
+--- /tmp/12keymap	2008-06-07 12:24:24.425525517 +0200
++++ xserver-common-1.22/X11/Xinit.d/12keymap	2008-06-07 12:27:35.152175933 +0200
+@@ -2,9 +2,6 @@
+ 
+ MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo`
+ 
+-# since kdrive 1.4 there is no default keymap in server
+-xmodmap - </etc/X11/default.xmodmap
+-
+ case $MACHINE in
+ 	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
+ 		xmodmap - < /etc/X11/shepherd.xmodmap
+@@ -28,5 +25,9 @@
+ 	"Simpad" | "HP iPAQ"* | "Asus MyPal"*)
+ 		xmodmap - < /etc/X11/keyboardless.xmodmap
+ 		;;
++	*)
++		# since kdrive 1.4 there is no default keymap in server
++		xmodmap - </etc/X11/default.xmodmap
++		;;
+ esac
+ 
============================================================
--- packages/xserver-common/xserver-common_1.22.bb	8752f199e55d1213507046c386dc15d5f4cf3a0c
+++ packages/xserver-common/xserver-common_1.22.bb	bfa048d518a53a0b613f50d7dabcaad5aeeec33b
@@ -2,7 +2,7 @@ RDEPENDS_${PN} = "xmodmap xrandr xdpyinf
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r4"
+PR = "r5"
 
 PACKAGE_ARCH = "all"
 
@@ -10,7 +10,9 @@ SRC_URI_append = " file://setDPI.sh "
 inherit gpe
 
 SRC_URI_append = " file://setDPI.sh "
-SRC_URI_append_angstrom = " file://kdrive-1.4-fixes.patch;patch=1"
+SRC_URI_append_angstrom = " file://kdrive-1.4-fixes.patch;patch=1 \
+                            file://kdrive-1.4-fixes-fix.patch;patch=1 \
+"
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"