xserver-common: move fallback keymap into case statement

diff --git a/packages/xserver-common/files/kdrive-1.4-fixes-fix.patch b/packages/xserver-common/files/kdrive-1.4-fixes-fix.patch
new file mode 100644 (file)
index 0000000..14b77e2
--- /dev/null
+++ b/packages/xserver-common/files/kdrive-1.4-fixes-fix.patch
@@ -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
+ 

diff --git a/packages/xserver-common/xserver-common_1.22.bb b/packages/xserver-common/xserver-common_1.22.bb
index 25f2abf..425e64c 100644 (file)
--- a/packages/xserver-common/xserver-common_1.22.bb
+++ b/packages/xserver-common/xserver-common_1.22.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r4"
+PR = "r5"
 
 PACKAGE_ARCH = "all"
 
@@ -10,7 +10,9 @@ PACKAGE_ARCH = "all"
 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"