mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

xkeyboard-config: Merge recipes (and fix DEPENDS)

Browse Source 
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2010-01-13 21:52:49 +00:00
parent 89ab1a22e3
commit f911c26cd3
2 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/xkeyboard-config/xkeyboard-config_1.3.bb
-16
View File
@@ -1,16 +0,0 @@
DESCRIPTION = "Common X11 Keyboard layouts"
LICENSE = "MIT"
DEPENDS = "intltool xkbcomp-native glib-2.0"
RDEPENDS = "xkbcomp"
PR = "r2"
SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2"
inherit autotools_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"
meta/packages/xorg-lib/xkeyboard-config_1.6.bb
+5 -3
View File
@@ -3,6 +3,7 @@ DESCRIPTION = "Keyboard configuration database for X Window"
SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2" SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2"
SECTION = "x11/libs" SECTION = "x11/libs"
LICENSE = "MIT-X" LICENSE = "MIT-X"
DEPENDS = "intltool xkbcomp-native glib-2.0"
PR = "r2" PR = "r2"
EXTRA_OECONF = "--with-xkb-rules-symlink=xorg" EXTRA_OECONF = "--with-xkb-rules-symlink=xorg"
@@ -12,6 +13,7 @@ FILES_${PN} += "${datadir}/X11/xkb"
inherit autotools_stage pkgconfig inherit autotools_stage pkgconfig
do_install_append () {
install -d ${D}/usr/share/X11/xkb/compiled
cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg
}