summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-06-07 10:32:58 +0000
committerKoen Kooi <koen@openembedded.org>2008-06-07 10:32:58 +0000
commit3596eaa64f0fb0508bac711f6a45b6e77a120192 (patch)
treeba422990bfd88b59d1ea9b4a0141bb1412a43835 /packages
parentd439745715885d3267b2595a1a0ea94507056d20 (diff)
xserver-common: move fallback keymap into case statement
Diffstat (limited to 'packages')
-rw-r--r--packages/xserver-common/files/kdrive-1.4-fixes-fix.patch22
-rw-r--r--packages/xserver-common/xserver-common_1.22.bb6
2 files changed, 26 insertions, 2 deletions
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
index 0000000000..14b77e20e9
--- /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 25f2abf148..425e64c627 100644
--- 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"