mirror of
https://git.yoctoproject.org/poky
synced 2026-03-16 04:09:39 +01:00
recipes/classes: Drop prepend/append usage with PACKAGESPLITFUNCS
As far as I can tell, none of these uses of PACKAGESPLITFUNCS need append/prepend operators, the standard += and =+ can work just fine. Since OE-Core is copied a lot, use the preferred syntax which is also simpler to parse and change. (From OE-Core rev: 846ff49465337dddd75a83161f41f48117f6571c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -35,7 +35,7 @@ do_install:append() {
|
||||
}
|
||||
|
||||
KERNEL_SPLIT_MODULES ?= "1"
|
||||
PACKAGESPLITFUNCS:prepend = "split_kernel_module_packages "
|
||||
PACKAGESPLITFUNCS =+ "split_kernel_module_packages "
|
||||
|
||||
KERNEL_MODULES_META_PACKAGE ?= "${@ d.getVar("KERNEL_PACKAGE_NAME") or "kernel" }-modules"
|
||||
|
||||
|
||||
@@ -705,7 +705,7 @@ pkg_postinst:${KERNEL_PACKAGE_NAME}-base () {
|
||||
fi
|
||||
}
|
||||
|
||||
PACKAGESPLITFUNCS:prepend = "split_kernel_packages "
|
||||
PACKAGESPLITFUNCS =+ "split_kernel_packages "
|
||||
|
||||
python split_kernel_packages () {
|
||||
do_split_packages(d, root='${nonarch_base_libdir}/firmware', file_regex=r'^(.*)\.(bin|fw|cis|csp|dsp)$', output_pattern='${KERNEL_PACKAGE_NAME}-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
|
||||
|
||||
@@ -205,7 +205,7 @@ python systemd_populate_packages() {
|
||||
systemd_check_services()
|
||||
}
|
||||
|
||||
PACKAGESPLITFUNCS:prepend = "systemd_populate_packages "
|
||||
PACKAGESPLITFUNCS =+ "systemd_populate_packages "
|
||||
|
||||
python rm_systemd_unitdir (){
|
||||
import shutil
|
||||
|
||||
@@ -265,7 +265,7 @@ def update_alternatives_alt_targets(d, pkg):
|
||||
|
||||
return updates
|
||||
|
||||
PACKAGESPLITFUNCS:prepend = "populate_packages_updatealternatives "
|
||||
PACKAGESPLITFUNCS =+ "populate_packages_updatealternatives "
|
||||
|
||||
python populate_packages_updatealternatives () {
|
||||
if not update_alternatives_enabled(d):
|
||||
|
||||
@@ -68,7 +68,7 @@ python __anonymous() {
|
||||
update_rc_after_parse(d)
|
||||
}
|
||||
|
||||
PACKAGESPLITFUNCS:prepend = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'populate_packages_updatercd ', '', d)}"
|
||||
PACKAGESPLITFUNCS =+ "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'populate_packages_updatercd ', '', d)}"
|
||||
PACKAGESPLITFUNCS:remove:class-nativesdk = "populate_packages_updatercd "
|
||||
|
||||
populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_postinst"
|
||||
|
||||
@@ -134,4 +134,4 @@ python split_wpa_supplicant_libs () {
|
||||
d.setVar('RRECOMMENDS:' + pn + '-plugins', ' '.join(split_packages))
|
||||
d.appendVar('RRECOMMENDS:' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages))
|
||||
}
|
||||
PACKAGESPLITFUNCS:prepend = "split_wpa_supplicant_libs "
|
||||
PACKAGESPLITFUNCS += "split_wpa_supplicant_libs "
|
||||
|
||||
@@ -302,7 +302,7 @@ ALTERNATIVE_LINK_NAME[Thread.3] = "${mandir}/man3/Thread.3"
|
||||
ALLOW_EMPTY:${PN}-modules = "1"
|
||||
PACKAGES += "${PN}-modules "
|
||||
|
||||
PACKAGESPLITFUNCS:prepend = "split_perl_packages "
|
||||
PACKAGESPLITFUNCS =+ "split_perl_packages "
|
||||
|
||||
python split_perl_packages () {
|
||||
libdir = d.expand('${libdir}/perl5/${PV}')
|
||||
|
||||
@@ -291,7 +291,7 @@ python mesa_populate_packages() {
|
||||
do_split_packages(d, pipe_drivers_root, r'^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
|
||||
}
|
||||
|
||||
PACKAGESPLITFUNCS:prepend = "mesa_populate_packages "
|
||||
PACKAGESPLITFUNCS =+ "mesa_populate_packages "
|
||||
|
||||
PACKAGES_DYNAMIC += "^mesa-driver-.*"
|
||||
PACKAGES_DYNAMIC:class-native = "^mesa-driver-.*-native"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# This .inc file contains functionality for automatically setting
|
||||
# the the license of all plugins according to the GSTREAMER_GPL.
|
||||
|
||||
PACKAGESPLITFUNCS:append = " set_gstreamer_license "
|
||||
PACKAGESPLITFUNCS += " set_gstreamer_license "
|
||||
|
||||
python set_gstreamer_license () {
|
||||
import oe.utils
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
# Dynamically generate packages for all enabled plugins
|
||||
PACKAGES_DYNAMIC = "^${PN}-.* ^libgst.*"
|
||||
|
||||
PACKAGESPLITFUNCS:prepend = " split_gstreamer10_packages "
|
||||
PACKAGESPLITFUNCS:append = " set_gstreamer10_metapkg_rdepends "
|
||||
PACKAGESPLITFUNCS =+ " split_gstreamer10_packages "
|
||||
PACKAGESPLITFUNCS += " set_gstreamer10_metapkg_rdepends "
|
||||
|
||||
python split_gstreamer10_packages () {
|
||||
gst_libdir = d.expand('${libdir}/gstreamer-1.0')
|
||||
|
||||
@@ -41,7 +41,7 @@ PACKAGES_DYNAMIC = "^${PN}-.*$"
|
||||
python split_libevent_libs () {
|
||||
do_split_packages(d, '${libdir}', r'^libevent_([a-z]*)-.*\.so\..*', '${PN}-%s', '${SUMMARY} (%s)', prepend=True, allow_links=True)
|
||||
}
|
||||
PACKAGESPLITFUNCS:prepend = "split_libevent_libs "
|
||||
PACKAGESPLITFUNCS =+ "split_libevent_libs "
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user