summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-09-30 09:27:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-04 13:46:22 +0100
commitb887e7fd3f25a8a5d675cbd4470c5bc6c780e0b5 (patch)
tree4382b0e486faa268a2724d2a38d763c879ddbb6b
parentc079b76ec8a920008754258516c3e7a02a8ecdac (diff)
downloadpoky-b887e7fd3f25a8a5d675cbd4470c5bc6c780e0b5.tar.gz
poky-b887e7fd3f25a8a5d675cbd4470c5bc6c780e0b5.tar.bz2
poky-b887e7fd3f25a8a5d675cbd4470c5bc6c780e0b5.zip
xorg-app-common: merge some changes from meta-oe
* use BPN directly instead of XORG_PN * fix depends * fix packaging * add INC_PR (used by recipes in meta-oe now, but should be used here too) (From OE-Core rev: fbf6dcefb719f992c8b7900aea9c719ce143d0b1) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-app/xorg-app-common.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/meta/recipes-graphics/xorg-app/xorg-app-common.inc
index 4add357cc9..86e5c2368b 100644
--- a/meta/recipes-graphics/xorg-app/xorg-app-common.inc
+++ b/meta/recipes-graphics/xorg-app/xorg-app-common.inc
@@ -3,14 +3,14 @@ HOMEPAGE = "http://www.x.org/"
BUGTRACKER = "https://bugs.freedesktop.org"
SECTION = "x11/apps"
LICENSE = "MIT-X"
-DEPENDS = "util-macros virtual/libx11"
+DEPENDS = "util-macros-native virtual/libx11"
-XORG_PN = "${BPN}"
+INC_PR = "r5"
-SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2"
-S = "${WORKDIR}/${XORG_PN}-${PV}"
+S = "${WORKDIR}/${BPN}-${PV}"
inherit autotools pkgconfig
-FILES_${PN} += " /usr/lib/X11/${XORG_PN}"
+FILES_${PN} += " /usr/lib/X11/${BPN} /usr/share/X11/app-defaults/"