summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-16 15:27:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-17 12:27:23 +0100
commitf784e9f53f333f05b3ef570334bf2f6bc9e972c4 (patch)
treea67fb60e26cb74ff7609d6b4a7bc502c1a4a75c4
parent061b9fd4b6dca030df1f2f00a59ad7d365b06894 (diff)
downloadopenembedded-core-f784e9f53f333f05b3ef570334bf2f6bc9e972c4.tar.gz
openembedded-core-f784e9f53f333f05b3ef570334bf2f6bc9e972c4.tar.bz2
openembedded-core-f784e9f53f333f05b3ef570334bf2f6bc9e972c4.zip
fontcache: Fix build dependency errors
This addresses warnings like: WARNING: QA Issue: liberation-fonts rdepends on fontconfig-utils but its not a build dependency? [build-deps] since the dependencies were being added at package time and were not visible to bitbake. Also take the opportunity to convert to use PACKAGEFUNCS rather than the horrible populate_packages_append. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/fontcache.bbclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index afd3fd2252..2bf1e4bd1b 100644
--- a/meta/classes/fontcache.bbclass
+++ b/meta/classes/fontcache.bbclass
@@ -18,13 +18,16 @@ else
fi
}
-python populate_packages_append() {
+python () {
font_pkgs = d.getVar('FONT_PACKAGES', True).split()
deps = d.getVar("FONT_EXTRA_RDEPENDS", True)
for pkg in font_pkgs:
if deps: d.appendVar('RDEPENDS_' + pkg, ' '+deps)
+}
+python add_fontcache_postinsts() {
+ for pkg in d.getVar('FONT_PACKAGES', True).split():
bb.note("adding fonts postinst and postrm scripts to %s" % pkg)
postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True)
if not postinst:
@@ -38,3 +41,5 @@ python populate_packages_append() {
postrm += d.getVar('fontcache_common', True)
d.setVar('pkg_postrm_%s' % pkg, postrm)
}
+
+PACKAGEFUNCS += "add_fontcache_postinsts"