From 0e2593e2e768d26f56652b1582b304acc5b5195a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 9 May 2012 20:06:53 +0000 Subject: ttf-fonts: call update-fonts only on target, not during do_rootfs Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb | 2 +- meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb | 2 +- meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb | 1 + meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb | 2 +- meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb | 2 +- meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb | 2 +- meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb | 2 +- meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb | 2 +- meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.69.bb | 2 +- meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb | 2 +- meta-oe/recipes-graphics/ttf-fonts/ttf.inc | 8 ++++++-- 11 files changed, 16 insertions(+), 11 deletions(-) (limited to 'meta-oe/recipes-graphics/ttf-fonts') diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb index 10fb9225ca..97b67b29df 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb @@ -4,7 +4,7 @@ LICENSE = "Arphic Public License" LIC_FILES_CHKSUM = "file://README;md5=62be011094b7865ddc4d1a648444d31a" SRC_DISTRIBUTE_LICENSES += "${PN}" RPROVIDES_${PN} = "virtual-chinese-font" -PR = "r3" +PR = "r4" SRC_URI = \ "http://archive.ubuntu.com/ubuntu/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_0.2.${PV}.1.orig.tar.gz" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb index d4ddf16b84..d7b39771f0 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb @@ -12,7 +12,7 @@ RDEPENDS_${PN}-sans-condensed = "${PN}-common" RDEPENDS_${PN}-serif = "${PN}-common" RDEPENDS_${PN}-serif-condensed = "${PN}-common" RDEPENDS_${PN}-common = "" -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-fonts-ttf-${PV}.tar.bz2 \ file://30-dejavu-aliases.conf" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb index e0a6c65a21..2c3bf2e9a8 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb @@ -6,6 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://README.txt;md5=83544262a86f1f1ec761e75897df92bc" SRCREV = "21e6e2de1f0062f949fcc52d0b4559dfa3246e0e" PV = "0.1+gitr${SRCPV}" +PR = "r1" SRC_URI = "git://github.com/android/platform_frameworks_base.git;protocol=git;branch=master" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb index b00bd75eca..ee27c12eb9 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb @@ -4,7 +4,7 @@ DESCRIPTION = "Gentium fonts - TTF Version" HOMEPAGE = "http://scripts.sil.org/gentium" LICENSE = "SIL Open Font License" LICENSE_URL = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=OFL" -PR = "r4" +PR = "r5" SRC_URI = "${DEBIAN_MIRROR}/main/t/ttf-gentium/ttf-gentium_${PV}.orig.tar.gz \ file://OFL.gz" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb index f841f1acbd..a2ef0cfa8e 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb @@ -3,7 +3,7 @@ require ttf.inc DESCRIPTION = "Hunky fonts - TTF Version" HOMEPAGE = "http://sourceforge.net/projects/hunkyfonts" LICENSE = "LGPL" -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/hunkyfonts/hunkyfonts-${PV}.tar.bz2" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb index 104915ee20..c0d77fd46c 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://License.txt;md5=5b171c5100029d884fcea21d9a2b7543 \ " -PR = "r4" +PR = "r5" SRC_URI = "http://fedorahosted.org/liberation-fonts/export/807b6dfd069b998cd9b4d3158da98817ef23c79d/F-9/liberation-fonts-ttf-3.tar.gz" S = "${WORKDIR}/liberation-fonts-${PV}" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb index 62acf824d4..ab9be352bd 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb @@ -3,7 +3,7 @@ require ttf.inc DESCRIPTION = "MPlus font - TTF Edition" HOMEPAGE = "http://dejavu.sourceforge.net/wiki/" LICENSE = "${PN}" -PR = "r1" +PR = "r2" SRC_URI = "http://osdn.dl.sourceforge.jp/mplus-fonts/6650/mplus-TESTFLIGHT-${PV}.tar.gz" S = "${WORKDIR}/mplus-TESTFLIGHT-${PV}" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb index 1e84fea2c6..3c4cb26d4b 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb @@ -9,7 +9,7 @@ LICENSE = "Public domain" LIC_FILES_CHKSUM = "file://README;md5=97d739900be6e852830f55aa3c07d4a0" SRC_DISTRIBUTE_LICENSES += "${PN}" RPROVIDES_${PN} = "virtual-japanese-font" -PR = "r6" +PR = "r7" SRC_URI = "http://osdn.dl.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2" S = "${WORKDIR}/sazanami-20040629" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.69.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.69.bb index 1c71b1b52e..22a7aecd22 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.69.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.69.bb @@ -3,7 +3,7 @@ require ttf.inc DESCRIPTION = "Ubuntu Font Family - TTF Version" HOMEPAGE = "http://font.ubuntu.com" LICENSE = "UFL" -PR = "r1" +PR = "r2" SRC_URI = "http://font.ubuntu.com/download/ubuntu-font-family-${PV}+ufl.zip" SRC_URI[md5sum] = "2c3287ea72f81ce025095f7a6d68af28" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb index 06de002db4..f1eb6ff53e 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb @@ -4,7 +4,7 @@ DESCRIPTION = "WenQuanYi Zen Hei - A Hei-Ti Style Chinese font" AUTHOR = "Qianqian Fang and The WenQuanYi Project Contributors" HOMEPAGE = "http://wqy.sourceforge.net/en/" LICENSE = "GPLv2" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/wqy/wqy-zenhei-${PV}-0.tar.gz" S = "${WORKDIR}/wqy-zenhei" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf.inc b/meta-oe/recipes-graphics/ttf-fonts/ttf.inc index bba94bd4db..d48f692fe7 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf.inc +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf.inc @@ -12,11 +12,15 @@ do_install() { } pkg_postinst_append() { - update-fonts + if [ -z "$D" ]; then + update-fonts + fi } pkg_postrm_append() { - update-fonts + if [ -z "$D" ]; then + update-fonts + fi } inherit allarch -- cgit 1.2.3-korg