aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-08-24 12:31:10 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-08-24 12:31:10 +0000
commit78a23dcea5d5b9b124e66afaffcebef37726769c (patch)
treedb5d2346ea1ef530819c252574cddb41586c6476 /packages
parent33faa169a9e16ff6216f94865d717e4104c6736a (diff)
parent8b098e896c62d72deecdefdb29db62343ccec916 (diff)
downloadopenembedded-78a23dcea5d5b9b124e66afaffcebef37726769c.tar.gz
merge of '1a4455548bddc38a21bde1cbdcb1d0fc7f25b9cc'
and '73307f34eb6c0e821ead39db55ec63966dbf5c6b'
Diffstat (limited to 'packages')
-rw-r--r--packages/xorg-font/font-util_1.0.1.bb2
-rw-r--r--packages/xorg-font/xfonts-xorg_6.8.bb2
-rw-r--r--packages/xorg-font/xorg-font-common.inc2
3 files changed, 6 insertions, 0 deletions
diff --git a/packages/xorg-font/font-util_1.0.1.bb b/packages/xorg-font/font-util_1.0.1.bb
index 915c40cd5c..3ba1c05a29 100644
--- a/packages/xorg-font/font-util_1.0.1.bb
+++ b/packages/xorg-font/font-util_1.0.1.bb
@@ -1,5 +1,7 @@
require xorg-font-common.inc
+PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
+
DESCRIPTION = "X font utils."
DEPENDS = "encodings"
diff --git a/packages/xorg-font/xfonts-xorg_6.8.bb b/packages/xorg-font/xfonts-xorg_6.8.bb
index f8a6a76964..78068e0534 100644
--- a/packages/xorg-font/xfonts-xorg_6.8.bb
+++ b/packages/xorg-font/xfonts-xorg_6.8.bb
@@ -3,6 +3,8 @@ PR = "r1"
# XXX Is this true? These fonts are from X.org.
LICENSE = "XFree86"
+PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
+
SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;tag=XORG-6_8_0;method=pserver \
file://lexer.patch;patch=1"
diff --git a/packages/xorg-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc
index c2977c8db9..09489b1cf8 100644
--- a/packages/xorg-font/xorg-font-common.inc
+++ b/packages/xorg-font/xorg-font-common.inc
@@ -22,6 +22,8 @@ do_stage() {
autotools_stage_all
}
+PACKAGE_ARCH = "all"
+
pkg_postinst_${PN} () {
set -x
for fontdir in `find $D/usr/lib/X11/fonts -type d`; do