Patchwork [15/19] fontcache: Fix build dependency errors

login
register
mail settings
Submitter Richard Purdie
Date July 16, 2014, 4:26 p.m.
Message ID <3e1f4fcab5bcf6cef53be21b578df289690522dc.1405527926.git.richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/75801/
State Accepted
Commit 9837b8ee97af1275a02e941be0d562dc9d40f358
Headers show

Comments

Richard Purdie - July 16, 2014, 4:26 p.m.
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>
---
 meta/classes/fontcache.bbclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Patch

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"