mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
87631af640
Previously only one global variant of the script was created, which caused numerous issues: 1) multilib was not properly supported due to multilib variants each needing their own version of the qemu binary and library paths to be set 2) nativesdk was not properly supported for the same reason This patch also moves setting LD_LIBRARY_PATH directly into the recipe, as passing it down from other recipes did not work when said recipes were allarch, and adjusts calls to qemuwrapper from postinst-intercepts, so that its correct variant is selected. Also, the various qemu fallbacks in qemuwrapper script are all removed, as they are no longer necessary. (From OE-Core rev: d10fd6ae3fe46290c6e3a5250878966d9f12ca3f) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
57 lines
1.9 KiB
Plaintext
57 lines
1.9 KiB
Plaintext
#
|
|
# This class will generate the proper postinst/postrm scriptlets for font
|
|
# packages.
|
|
#
|
|
|
|
PACKAGE_WRITE_DEPS += "qemu-native"
|
|
inherit qemu
|
|
|
|
FONT_PACKAGES ??= "${PN}"
|
|
FONT_EXTRA_RDEPENDS ?= "fontconfig-utils"
|
|
FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
|
|
FONTCONFIG_CACHE_PARAMS ?= "-v"
|
|
# You can change this to e.g. FC_DEBUG=16 to debug fc-cache issues,
|
|
# something has to be set, because qemuwrapper is using this variable after -E
|
|
# multiple variables aren't allowed because for qemu they are separated
|
|
# by comma and in -n "$D" case they should be separated by space
|
|
FONTCONFIG_CACHE_ENV ?= "FC_DEBUG=1"
|
|
fontcache_common() {
|
|
if [ -n "$D" ] ; then
|
|
$INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} \
|
|
'bindir="${bindir}"' \
|
|
'libdir="${libdir}"' \
|
|
'base_libdir="${base_libdir}"' \
|
|
'fontconfigcachedir="${FONTCONFIG_CACHE_DIR}"' \
|
|
'fontconfigcacheparams="${FONTCONFIG_CACHE_PARAMS}"' \
|
|
'fontconfigcacheenv="${FONTCONFIG_CACHE_ENV}"'
|
|
else
|
|
${FONTCONFIG_CACHE_ENV} fc-cache ${FONTCONFIG_CACHE_PARAMS}
|
|
fi
|
|
}
|
|
|
|
python () {
|
|
font_pkgs = d.getVar('FONT_PACKAGES').split()
|
|
deps = d.getVar("FONT_EXTRA_RDEPENDS")
|
|
|
|
for pkg in font_pkgs:
|
|
if deps: d.appendVar('RDEPENDS_' + pkg, ' '+deps)
|
|
}
|
|
|
|
python add_fontcache_postinsts() {
|
|
for pkg in d.getVar('FONT_PACKAGES').split():
|
|
bb.note("adding fonts postinst and postrm scripts to %s" % pkg)
|
|
postinst = d.getVar('pkg_postinst_%s' % pkg) or d.getVar('pkg_postinst')
|
|
if not postinst:
|
|
postinst = '#!/bin/sh\n'
|
|
postinst += d.getVar('fontcache_common')
|
|
d.setVar('pkg_postinst_%s' % pkg, postinst)
|
|
|
|
postrm = d.getVar('pkg_postrm_%s' % pkg) or d.getVar('pkg_postrm')
|
|
if not postrm:
|
|
postrm = '#!/bin/sh\n'
|
|
postrm += d.getVar('fontcache_common')
|
|
d.setVar('pkg_postrm_%s' % pkg, postrm)
|
|
}
|
|
|
|
PACKAGEFUNCS =+ "add_fontcache_postinsts"
|