mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 03:32:13 +02:00
xkeyboard-config: Merge recipes (and fix DEPENDS)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
@@ -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"
|
||||
@@ -3,6 +3,7 @@ DESCRIPTION = "Keyboard configuration database for X Window"
|
||||
SRC_URI = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${PV}.tar.bz2"
|
||||
SECTION = "x11/libs"
|
||||
LICENSE = "MIT-X"
|
||||
DEPENDS = "intltool xkbcomp-native glib-2.0"
|
||||
PR = "r2"
|
||||
|
||||
EXTRA_OECONF = "--with-xkb-rules-symlink=xorg"
|
||||
@@ -12,6 +13,7 @@ FILES_${PN} += "${datadir}/X11/xkb"
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user