diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-17 23:03:02 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-04 13:46:26 +0100 |
commit | 9bf0d8898b028f2b3379dc43fe647eb38c022f53 (patch) | |
tree | 2b2d3ab2f12a8366e75b0e2fcba081226df03b58 /meta/recipes-graphics/ttf-fonts | |
parent | bcc8425b92dc9adc793473a9733559d377480811 (diff) | |
download | poky-9bf0d8898b028f2b3379dc43fe647eb38c022f53.tar.gz |
Improve handling of 'all' architecture recipes and their interaction with sstate
* Jansa: rebased on current master, added nocompiler patch also to
font-alias, dropped allarch from linux-firmware, gnome-icon-theme, hal-info as
those are checking compiler (ie in intltool check) and better to build
them as default arch instead of rebuilding after every machine
change.
* this is also part of [BUGID# 1075]
(From OE-Core rev: 85d8362e0c443f11fe8d3fd0fba55d1bd4983613)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/ttf-fonts')
3 files changed, 9 insertions, 6 deletions
diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb index 19bb69c1f3..b0a8242d82 100644 --- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb +++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb | |||
@@ -8,11 +8,12 @@ BUGTRACKER = "https://bugzilla.redhat.com/" | |||
8 | SECTION = "x11/fonts" | 8 | SECTION = "x11/fonts" |
9 | LICENSE = "GPLv2" | 9 | LICENSE = "GPLv2" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
11 | PACKAGE_ARCH = "all" | ||
12 | RDEPENDS_${PN} = "fontconfig-utils" | 11 | RDEPENDS_${PN} = "fontconfig-utils" |
13 | PR = "r1" | 12 | PR = "r2" |
14 | PE = "1" | 13 | PE = "1" |
15 | 14 | ||
15 | inherit allarch | ||
16 | |||
16 | SRC_URI = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${PV}.tar.gz \ | 17 | SRC_URI = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-${PV}.tar.gz \ |
17 | file://30-liberation-aliases.conf" | 18 | file://30-liberation-aliases.conf" |
18 | 19 | ||
diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb index 4882cc7be3..5193fda3af 100644 --- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb +++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb | |||
@@ -8,10 +8,9 @@ BUGTRACKER = "https://bugzilla.redhat.com/" | |||
8 | SECTION = "x11/fonts" | 8 | SECTION = "x11/fonts" |
9 | LICENSE = "GPLv2" | 9 | LICENSE = "GPLv2" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
11 | PACKAGE_ARCH = "all" | ||
12 | RDEPENDS_${PN} = "fontconfig-utils" | 11 | RDEPENDS_${PN} = "fontconfig-utils" |
13 | PE = "1" | 12 | PE = "1" |
14 | PR = "r1" | 13 | PR = "r2" |
15 | 14 | ||
16 | FONTREV = "0.20100721" | 15 | FONTREV = "0.20100721" |
17 | SRC_URI = "https://fedorahosted.org/releases/l/i/${BPN}/${BPN}-${PV}.${FONTREV}.tar.gz \ | 16 | SRC_URI = "https://fedorahosted.org/releases/l/i/${BPN}/${BPN}-${PV}.${FONTREV}.tar.gz \ |
@@ -19,6 +18,8 @@ SRC_URI = "https://fedorahosted.org/releases/l/i/${BPN}/${BPN}-${PV}.${FONTREV}. | |||
19 | 18 | ||
20 | S = ${WORKDIR}/${BPN}-${PV}.${FONTREV} | 19 | S = ${WORKDIR}/${BPN}-${PV}.${FONTREV} |
21 | 20 | ||
21 | inherit allarch | ||
22 | |||
22 | do_install () { | 23 | do_install () { |
23 | install -d ${D}${datadir}/fonts/ttf/ | 24 | install -d ${D}${datadir}/fonts/ttf/ |
24 | for i in *.ttf; do | 25 | for i in *.ttf; do |
diff --git a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb index 3294b40ae0..682184a95d 100644 --- a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb +++ b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb | |||
@@ -7,10 +7,11 @@ but is visibly different than normal and bold, and reasonably pleasing." | |||
7 | SECTION = "x11/fonts" | 7 | SECTION = "x11/fonts" |
8 | LICENSE = "Bitstream_Vera" | 8 | LICENSE = "Bitstream_Vera" |
9 | LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be" | 9 | LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be" |
10 | PACKAGE_ARCH = "all" | 10 | PR = "r5" |
11 | PR = "r4" | ||
12 | RDEPENDS_${PN} = "fontconfig-utils" | 11 | RDEPENDS_${PN} = "fontconfig-utils" |
13 | 12 | ||
13 | inherit allarch | ||
14 | |||
14 | SRC_URI = "${GNOME_MIRROR}/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" | 15 | SRC_URI = "${GNOME_MIRROR}/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" |
15 | 16 | ||
16 | do_install () { | 17 | do_install () { |