xkeyboard-config: merge from poky

diff --git a/packages/xkeyboard-config/xkeyboard-config_1.3.bb b/packages/xkeyboard-config/xkeyboard-config_1.3.bb
index f69e63c..cb448be 100644 (file)
--- a/packages/xkeyboard-config/xkeyboard-config_1.3.bb
+++ b/packages/xkeyboard-config/xkeyboard-config_1.3.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Common X11 Keyboard layouts"
 LICENSE = "MIT"
 DEPENDS = "intltool xkbcomp-native"
 RDEPENDS = "xkbcomp"
+PR = "r2"
 
 SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2"
 
@@ -13,4 +14,7 @@ do_stage() {
 
 do_install_append () {
     install -d ${D}/usr/share/X11/xkb/compiled
+    cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
 }
+
+FILES_${PN} += "${datadir}/X11/xkb"