mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
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>
This commit is contained in:
@@ -18,13 +18,16 @@ else
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
python populate_packages_append() {
|
python () {
|
||||||
font_pkgs = d.getVar('FONT_PACKAGES', True).split()
|
font_pkgs = d.getVar('FONT_PACKAGES', True).split()
|
||||||
deps = d.getVar("FONT_EXTRA_RDEPENDS", True)
|
deps = d.getVar("FONT_EXTRA_RDEPENDS", True)
|
||||||
|
|
||||||
for pkg in font_pkgs:
|
for pkg in font_pkgs:
|
||||||
if deps: d.appendVar('RDEPENDS_' + pkg, ' '+deps)
|
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)
|
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)
|
postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True)
|
||||||
if not postinst:
|
if not postinst:
|
||||||
@@ -38,3 +41,5 @@ python populate_packages_append() {
|
|||||||
postrm += d.getVar('fontcache_common', True)
|
postrm += d.getVar('fontcache_common', True)
|
||||||
d.setVar('pkg_postrm_%s' % pkg, postrm)
|
d.setVar('pkg_postrm_%s' % pkg, postrm)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
PACKAGEFUNCS += "add_fontcache_postinsts"
|
||||||
|
|||||||
Reference in New Issue
Block a user