[oe-commits] Richard Purdie : fontcache: Fix build dependency errors
git at git.openembedded.org
git at git.openembedded.org
Thu Jul 17 11:32:34 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: f784e9f53f333f05b3ef570334bf2f6bc9e972c4
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f784e9f53f333f05b3ef570334bf2f6bc9e972c4
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Wed Jul 16 15:27:42 2014 +0000
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 at linuxfoundation.org>
---
meta/classes/fontcache.bbclass | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index afd3fd2..2bf1e4b 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"
More information about the Openembedded-commits
mailing list