diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-16 15:27:42 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-17 12:28:50 +0100 |
commit | 9837b8ee97af1275a02e941be0d562dc9d40f358 (patch) | |
tree | 6befe3436d7ccf760608c427d59e54ac738185b7 | |
parent | 33636381aad7c509b1ffd9fe62d18871d563f771 (diff) | |
download | poky-9837b8ee97af1275a02e941be0d562dc9d40f358.tar.gz |
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.
(From OE-Core rev: f784e9f53f333f05b3ef570334bf2f6bc9e972c4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/fontcache.bbclass | 7 |
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 | |||
18 | fi | 18 | fi |
19 | } | 19 | } |
20 | 20 | ||
21 | python populate_packages_append() { | 21 | python () { |
22 | font_pkgs = d.getVar('FONT_PACKAGES', True).split() | 22 | font_pkgs = d.getVar('FONT_PACKAGES', True).split() |
23 | deps = d.getVar("FONT_EXTRA_RDEPENDS", True) | 23 | deps = d.getVar("FONT_EXTRA_RDEPENDS", True) |
24 | 24 | ||
25 | for pkg in font_pkgs: | 25 | for pkg in font_pkgs: |
26 | if deps: d.appendVar('RDEPENDS_' + pkg, ' '+deps) | 26 | if deps: d.appendVar('RDEPENDS_' + pkg, ' '+deps) |
27 | } | ||
27 | 28 | ||
29 | python add_fontcache_postinsts() { | ||
30 | for pkg in d.getVar('FONT_PACKAGES', True).split(): | ||
28 | bb.note("adding fonts postinst and postrm scripts to %s" % pkg) | 31 | bb.note("adding fonts postinst and postrm scripts to %s" % pkg) |
29 | postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) | 32 | postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) |
30 | if not postinst: | 33 | if not postinst: |
@@ -38,3 +41,5 @@ python populate_packages_append() { | |||
38 | postrm += d.getVar('fontcache_common', True) | 41 | postrm += d.getVar('fontcache_common', True) |
39 | d.setVar('pkg_postrm_%s' % pkg, postrm) | 42 | d.setVar('pkg_postrm_%s' % pkg, postrm) |
40 | } | 43 | } |
44 | |||
45 | PACKAGEFUNCS += "add_fontcache_postinsts" | ||