From c5c9c53c4e736d491d0baf01c94a76099acd4f6f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 4 Aug 2011 13:59:14 +0100 Subject: font-util: The recipe produces binaries so don't mark as 'all' architecture Since font-util produces binaries it shouldn't be marked as "all" package architecture. To achieve this we need to move the settings out the common include file. This fixes errors like: ERROR: runstrip: ''mips-poky-linux-strip' --remove-section=.comment --remove-section=.note '/srv/home/pokybuild/poky-slave/nightly-external/build/build/tmp/work/all-poky-linux/font-util-1.2.0-r2.1/package/usr/bin/bdftruncate'' strip command failed ERROR: runstrip: ''mips-poky-linux-strip' --remove-section=.comment --remove-section=.note '/srv/home/pokybuild/poky-slave/nightly-external/build/build/tmp/work/all-poky-linux/font-util-1.2.0-r2.1/package/usr/bin/ucs2any'' strip command failed (From OE-Core rev: 7aefddc57e9da02298af1aa98abedbe99435e15a) Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-font/encodings_1.0.4.bb | 2 ++ meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb | 2 ++ meta/recipes-graphics/xorg-font/xorg-font-common.inc | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics/xorg-font') diff --git a/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb b/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb index 04d7c73956..1345134432 100644 --- a/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb +++ b/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb @@ -13,5 +13,7 @@ DEPENDS = "mkfontscale-native font-util-native" EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings" +PACKAGE_ARCH = "all" + SRC_URI[md5sum] = "0f2d6546d514c5cc4ecf78a60657a5c1" SRC_URI[sha256sum] = "ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539" diff --git a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb index cec890d015..1b639614cb 100644 --- a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +++ b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb @@ -16,5 +16,7 @@ RDEPENDS_${PN}_virtclass-native = "font-util-native" PE = "1" PR = "${INC_PR}.1" +PACKAGE_ARCH = "all" + SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a" diff --git a/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/meta/recipes-graphics/xorg-font/xorg-font-common.inc index 5d19b4c704..d93b4ee42a 100644 --- a/meta/recipes-graphics/xorg-font/xorg-font-common.inc +++ b/meta/recipes-graphics/xorg-font/xorg-font-common.inc @@ -30,8 +30,6 @@ do_install_append() { find ${D}${datadir}/fonts/X11 -type f -name fonts.scale | xargs rm -f } -PACKAGE_ARCH = "all" - FILES_${PN} += " ${libdir}/X11/fonts ${datadir}" pkg_postinst_${PN} () { -- cgit v1.2.3-54-g00ecf