diff options
| -rw-r--r-- | meta/packages/xkeyboard-config/xkeyboard-config_1.3.bb | 16 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/xkeyboard-config_1.6.bb | 8 |
2 files changed, 5 insertions, 19 deletions
diff --git a/meta/packages/xkeyboard-config/xkeyboard-config_1.3.bb b/meta/packages/xkeyboard-config/xkeyboard-config_1.3.bb deleted file mode 100644 index f0e975317e..0000000000 --- a/meta/packages/xkeyboard-config/xkeyboard-config_1.3.bb +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | DESCRIPTION = "Common X11 Keyboard layouts" | ||
| 2 | LICENSE = "MIT" | ||
| 3 | DEPENDS = "intltool xkbcomp-native glib-2.0" | ||
| 4 | RDEPENDS = "xkbcomp" | ||
| 5 | PR = "r2" | ||
| 6 | |||
| 7 | SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2" | ||
| 8 | |||
| 9 | inherit autotools_stage | ||
| 10 | |||
| 11 | do_install_append () { | ||
| 12 | install -d ${D}/usr/share/X11/xkb/compiled | ||
| 13 | cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg | ||
| 14 | } | ||
| 15 | |||
| 16 | FILES_${PN} += "${datadir}/X11/xkb" | ||
diff --git a/meta/packages/xorg-lib/xkeyboard-config_1.6.bb b/meta/packages/xorg-lib/xkeyboard-config_1.6.bb index 86e737fa86..a2f58be9ea 100644 --- a/meta/packages/xorg-lib/xkeyboard-config_1.6.bb +++ b/meta/packages/xorg-lib/xkeyboard-config_1.6.bb | |||
| @@ -3,6 +3,7 @@ DESCRIPTION = "Keyboard configuration database for X Window" | |||
| 3 | SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2" | 3 | SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2" |
| 4 | SECTION = "x11/libs" | 4 | SECTION = "x11/libs" |
| 5 | LICENSE = "MIT-X" | 5 | LICENSE = "MIT-X" |
| 6 | DEPENDS = "intltool xkbcomp-native glib-2.0" | ||
| 6 | PR = "r2" | 7 | PR = "r2" |
| 7 | 8 | ||
| 8 | EXTRA_OECONF = "--with-xkb-rules-symlink=xorg" | 9 | EXTRA_OECONF = "--with-xkb-rules-symlink=xorg" |
| @@ -12,6 +13,7 @@ FILES_${PN} += "${datadir}/X11/xkb" | |||
| 12 | 13 | ||
| 13 | inherit autotools_stage pkgconfig | 14 | inherit autotools_stage pkgconfig |
| 14 | 15 | ||
| 15 | 16 | do_install_append () { | |
| 16 | 17 | install -d ${D}/usr/share/X11/xkb/compiled | |
| 17 | 18 | cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg | |
| 19 | } | ||
