kmod: drop from meta-oe
PATCH 1/2 kmod: drop from meta-oe
* it was added to oe-core
--- ...-man-page-generation-because-we-don-t-hav.patch | 26 -------------------- meta-oe/recipes-kernel/kmod/kmod_git.bb | 24 ------------------ 2 files changed, 0 insertions(+), 50 deletions(-) delete mode 100644 meta-oe/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch delete mode 100644 meta-oe/recipes-kernel/kmod/kmod_git.bb
meta-oe/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From ce6f0cabb65e67dd4d31e1e555db8bc6eaf435d3 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <[email protected]> -Date: Fri, 24 Feb 2012 07:35:38 +0100 -Subject: [PATCH] man: disable man page generation because we don't have - working xsltproc - -Upstream-Status: Inappropriate [build system specific change] - -Signed-off-by: Martin Jansa <[email protected]> ---- - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 141c102..a8bdfd1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = . libkmod/docs man -+SUBDIRS = . libkmod/docs - - DISTCLEAN_LOCAL_HOOKS = - EXTRA_DIST = --- -1.7.8.4 -
meta-oe/recipes-kernel/kmod/kmod_git.bb deleted +0 -24
@@ -1,24 +0,0 @@ -DESCRIPTION = "kmod - handle kernel modules" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -PR = "r3" - -inherit autotools gitpkgv - -PKGV = "${GITPKGVTAG}" -SRCREV = "8885ced062131214448fae056ef453f094303805" -SRC_URI = "git://git.profusion.mobi/kmod.git \ - file://0001-man-disable-man-page-generation-because-we-don-t-hav.patch \ -" - -S = "${WORKDIR}/git" - -do_configure_prepend() { - gtkdocize --docdir ${S}/libkmod/docs || touch ${S}/libkmod/docs/gtk-doc.make -} - -PACKAGES =+ "libkmod" -FILES_libkmod = "${libdir}/lib*${SOLIBS}" -
Signature · 1 line
1.7.8.6
PATCH 2/2 ttf-fonts: call update-fonts only on target, not during do_rootfs
--- .../ttf-fonts/ttf-arphic-uming_20080216.bb | 2 +- .../recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb | 2 +- .../recipes-graphics/ttf-fonts/ttf-droid_git.bb | 1 + .../recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb | 2 +- .../ttf-fonts/ttf-hunkyfonts_0.3.0.bb | 2 +- .../ttf-fonts/ttf-liberation_0.2.bb | 2 +- .../recipes-graphics/ttf-fonts/ttf-mplus_027.bb | 2 +- .../ttf-fonts/ttf-sazanami_20040629.bb | 2 +- .../ttf-fonts/ttf-ubuntu-font-family_0.69.bb | 2 +- .../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(-)
meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb +1 -1
@@ -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"
meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb +1 -1
@@ -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"
meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb +1 -0
@@ -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"
meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb +1 -1
@@ -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"
meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb +1 -1
@@ -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"
meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb +1 -1
@@ -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}"
meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb +1 -1
@@ -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}"
meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb +1 -1
@@ -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"
meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.69.bb +1 -1
@@ -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"
meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb +1 -1
@@ -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"
meta-oe/recipes-graphics/ttf-fonts/ttf.inc +6 -2
@@ -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
Signature · 1 line
1.7.8.6
Re: [meta-oe][PATCH 2/2] ttf-fonts: call update-fonts only on target, not during do_rootfs
Quoted 2 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>---
ignore this one.. only on ML I've noticed thatpkg_postrm_append() {
should be even improved to
pkg_postrm_${PN}_append() {
Cheers,
Quoted 167 lines
.../ttf-fonts/ttf-arphic-uming_20080216.bb | 2 +- .../recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb | 2 +- .../recipes-graphics/ttf-fonts/ttf-droid_git.bb | 1 + .../recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb | 2 +- .../ttf-fonts/ttf-hunkyfonts_0.3.0.bb | 2 +- .../ttf-fonts/ttf-liberation_0.2.bb | 2 +- .../recipes-graphics/ttf-fonts/ttf-mplus_027.bb | 2 +- .../ttf-fonts/ttf-sazanami_20040629.bb | 2 +- .../ttf-fonts/ttf-ubuntu-font-family_0.69.bb | 2 +- .../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(-)meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb +1
-1@@ -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"meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb +1
-1@@ -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"meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb +1
-0@@ -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"meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb +1
-1@@ -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"meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb +1
-1@@ -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"meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb +1
-1@@ -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}"meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb +1
-1@@ -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}"meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb +1
-1@@ -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"meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.69.bb +1
-1@@ -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"meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb +1
-1@@ -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"meta-oe/recipes-graphics/ttf-fonts/ttf.inc +6
-2@@ -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 allarchSignature · 1 line
1.7.8.6
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [meta-oe][PATCH 2/2] ttf-fonts: call update-fonts only on target, not during do_rootfs
Quoted 8 lines · Martin Jansa
Quoted 2 lines · Martin Jansa
Signed-off-by Martin Jansa <[email protected]>---
ignore this one.. only on ML I've noticed that
pkg_postrm_append(){
should be even improved to
pkg_postrm_${PN}_append() {
Grr, otherway around.. v1 was better because recipes including ttf.inc does e.g.
ttf-ubuntu-font-family_0.69.bb:
PACKAGES = "${PN}-dbg ttf-ubuntu-mono ttf-ubuntu-sans ttf-ubuntu-serif"
so we need this postins/postrm in all subpackages (except ${PN}-dbg where I have noticed it first).
So better to apply it for all then for none (ttf-ubuntu-font-family == ${PN} doesn't exist)
I'll update patchwork status to keep only right one.
Sorry for noise..
Cheers,
Quoted 174 lines
Cheers,
Quoted 167 lines
.../ttf-fonts/ttf-arphic-uming_20080216.bb | 2 +- .../recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb | 2 +- .../recipes-graphics/ttf-fonts/ttf-droid_git.bb | 1 + .../recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb | 2 +- .../ttf-fonts/ttf-hunkyfonts_0.3.0.bb | 2 +- .../ttf-fonts/ttf-liberation_0.2.bb | 2 +- .../recipes-graphics/ttf-fonts/ttf-mplus_027.bb | 2 +- .../ttf-fonts/ttf-sazanami_20040629.bb | 2 +- .../ttf-fonts/ttf-ubuntu-font-family_0.69.bb | 2 +- .../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(-)meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb +1
-1@@ -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"meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb +1
-1@@ -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"meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb +1
-0@@ -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"meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb +1
-1@@ -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"meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb +1
-1@@ -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"meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb +1
-1@@ -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}"meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb +1
-1@@ -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}"meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb +1
-1@@ -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"meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.69.bb +1
-1@@ -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"meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb +1
-1@@ -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"meta-oe/recipes-graphics/ttf-fonts/ttf.inc +6
-2@@ -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 allarchSignature · 1 line
1.7.8.6Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
PATCH v2 2/2 ttf-fonts: call update-fonts only on target, not during do_rootfs
In reply to Martin Jansa--- .../ttf-fonts/ttf-arphic-uming_20080216.bb | 2 +- .../recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb | 2 +- .../recipes-graphics/ttf-fonts/ttf-droid_git.bb | 1 + .../recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb | 2 +- .../ttf-fonts/ttf-hunkyfonts_0.3.0.bb | 2 +- .../ttf-fonts/ttf-liberation_0.2.bb | 2 +- .../recipes-graphics/ttf-fonts/ttf-mplus_027.bb | 2 +- .../ttf-fonts/ttf-sazanami_20040629.bb | 2 +- .../ttf-fonts/ttf-ubuntu-font-family_0.69.bb | 2 +- .../ttf-fonts/ttf-wqy-zenhei_0.6.26.bb | 2 +- meta-oe/recipes-graphics/ttf-fonts/ttf.inc | 12 ++++++++---- 11 files changed, 18 insertions(+), 13 deletions(-)
meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb +1 -1
@@ -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"
meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.23.bb +1 -1
@@ -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"
meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb +1 -0
@@ -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"
meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb +1 -1
@@ -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"
meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.0.bb +1 -1
@@ -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"
meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb +1 -1
@@ -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}"
meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb +1 -1
@@ -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}"
meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb +1 -1
@@ -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"
meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.69.bb +1 -1
@@ -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"
meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.6.26.bb +1 -1
@@ -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"
meta-oe/recipes-graphics/ttf-fonts/ttf.inc +8 -4
@@ -11,12 +11,16 @@ do_install() { find ./ -name '*.tt[cf]' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; } -pkg_postinst_append() { - update-fonts +pkg_postinst_${PN} () { + if [ -z "$D" ]; then + update-fonts + fi } -pkg_postrm_append() { - update-fonts +pkg_postrm_${PN} () { + if [ -z "$D" ]; then + update-fonts + fi } inherit allarch
Signature · 1 line
1.7.8.6