summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2013-03-15 16:04:02 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-16 17:53:58 +0000
commit72e77b82f71a7993e44c7f461423bbc3a93a13f6 (patch)
tree9d806f047f80064317a7fe8e5ae7b901594940e5
parentef2ce8faff03df9c0c893c0eabf72b7fe65fe516 (diff)
downloadpoky-72e77b82f71a7993e44c7f461423bbc3a93a13f6.tar.gz
ttf-fonts: fix PN -> BPN in do_install for multilibs
(From OE-Core rev: 7720c356534e46614578619d5a8f0462485b81f6) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb6
-rw-r--r--meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb6
-rw-r--r--meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb6
3 files changed, 9 insertions, 9 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 67e36e2a01..a34825ab19 100644
--- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
+++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb
@@ -9,7 +9,7 @@ SECTION = "x11/fonts"
9LICENSE = "GPLv2" 9LICENSE = "GPLv2"
10LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 10LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
11RDEPENDS_${PN} = "fontconfig-utils" 11RDEPENDS_${PN} = "fontconfig-utils"
12PR = "r3" 12PR = "r4"
13PE = "1" 13PE = "1"
14 14
15inherit allarch fontcache 15inherit allarch fontcache
@@ -31,8 +31,8 @@ do_install () {
31 install -d ${D}${sysconfdir}/fonts/conf.d/ 31 install -d ${D}${sysconfdir}/fonts/conf.d/
32 install -m 0644 ${WORKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ 32 install -m 0644 ${WORKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/
33 33
34 install -d ${D}${prefix}/share/doc/${PN}/ 34 install -d ${D}${prefix}/share/doc/${BPN}/
35 install -m 0644 License.txt ${D}${datadir}/doc/${PN}/ 35 install -m 0644 License.txt ${D}${datadir}/doc/${BPN}/
36} 36}
37 37
38PACKAGES = "${PN}" 38PACKAGES = "${PN}"
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 0ac4debcd6..6391f51227 100644
--- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb
+++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.06.bb
@@ -10,7 +10,7 @@ LICENSE = "GPLv2"
10LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 10LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
11RDEPENDS_${PN} = "fontconfig-utils" 11RDEPENDS_${PN} = "fontconfig-utils"
12PE = "1" 12PE = "1"
13PR = "r2" 13PR = "r3"
14 14
15FONTREV = "0.20100721" 15FONTREV = "0.20100721"
16SRC_URI = "https://fedorahosted.org/releases/l/i/${BPN}/${BPN}-${PV}.${FONTREV}.tar.gz \ 16SRC_URI = "https://fedorahosted.org/releases/l/i/${BPN}/${BPN}-${PV}.${FONTREV}.tar.gz \
@@ -29,8 +29,8 @@ do_install () {
29 install -d ${D}${sysconfdir}/fonts/conf.d/ 29 install -d ${D}${sysconfdir}/fonts/conf.d/
30 install -m 0644 ${WORKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ 30 install -m 0644 ${WORKDIR}/30-liberation-aliases.conf ${D}${sysconfdir}/fonts/conf.d/
31 31
32 install -d ${D}${prefix}/share/doc/${PN}/ 32 install -d ${D}${prefix}/share/doc/${BPN}/
33 install -m 0644 License.txt ${D}${datadir}/doc/${PN}/ 33 install -m 0644 License.txt ${D}${datadir}/doc/${BPN}/
34} 34}
35 35
36pkg_postinst_${PN} () { 36pkg_postinst_${PN} () {
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 6214c16278..71e85e4088 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,7 +7,7 @@ but is visibly different than normal and bold, and reasonably pleasing."
7SECTION = "x11/fonts" 7SECTION = "x11/fonts"
8LICENSE = "BitstreamVera" 8LICENSE = "BitstreamVera"
9LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be" 9LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be"
10PR = "r6" 10PR = "r7"
11RDEPENDS_${PN} = "fontconfig-utils" 11RDEPENDS_${PN} = "fontconfig-utils"
12 12
13inherit allarch 13inherit allarch
@@ -25,9 +25,9 @@ do_install () {
25 #install -m 644 local.conf ${D}${sysconfdir}/fonts/local.conf 25 #install -m 644 local.conf ${D}${sysconfdir}/fonts/local.conf
26 26
27 27
28 install -d ${D}${prefix}/share/doc/${PN}/ 28 install -d ${D}${prefix}/share/doc/${BPN}/
29 for i in *.TXT; do 29 for i in *.TXT; do
30 install -m 644 $i ${D}${prefix}/share/doc/${PN}/$i 30 install -m 644 $i ${D}${prefix}/share/doc/${BPN}/$i
31 done 31 done
32} 32}
33 33