summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-04 12:59:14 (GMT)
committerSaul Wold <sgw@linux.intel.com>2011-08-04 16:09:56 (GMT)
commitbe9e43946c83c16e18cb5b8349d91b6f49c57d79 (patch)
treea2a8f204e3686f88087910340efdb58ca4c32228
parent496833833839386dceb44e7d29a1f87836b61ca5 (diff)
downloadpoky-be9e43946c83c16e18cb5b8349d91b6f49c57d79.tar.gz
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 <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-font/encodings_1.0.4.bb2
-rw-r--r--meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb2
-rw-r--r--meta/recipes-graphics/xorg-font/xorg-font-common.inc2
3 files changed, 4 insertions, 2 deletions
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 04d7c73..1345134 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"
13 13
14EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings" 14EXTRA_OECONF += "--with-encodingsdir=${datadir}/fonts/X11/encodings"
15 15
16PACKAGE_ARCH = "all"
17
16SRC_URI[md5sum] = "0f2d6546d514c5cc4ecf78a60657a5c1" 18SRC_URI[md5sum] = "0f2d6546d514c5cc4ecf78a60657a5c1"
17SRC_URI[sha256sum] = "ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539" 19SRC_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 cec890d..1b63961 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"
16PE = "1" 16PE = "1"
17PR = "${INC_PR}.1" 17PR = "${INC_PR}.1"
18 18
19PACKAGE_ARCH = "all"
20
19SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562" 21SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562"
20SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a" 22SRC_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 5d19b4c..d93b4ee 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() {
30 find ${D}${datadir}/fonts/X11 -type f -name fonts.scale | xargs rm -f 30 find ${D}${datadir}/fonts/X11 -type f -name fonts.scale | xargs rm -f
31} 31}
32 32
33PACKAGE_ARCH = "all"
34
35FILES_${PN} += " ${libdir}/X11/fonts ${datadir}" 33FILES_${PN} += " ${libdir}/X11/fonts ${datadir}"
36 34
37pkg_postinst_${PN} () { 35pkg_postinst_${PN} () {