summaryrefslogtreecommitdiffstats
path: root/meta/classes-recipe
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-04 15:24:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-05 11:52:50 +0000
commitd32dc08a77123517877f355b174606a357f746d5 (patch)
treef412037ed77b3f2828dfd8a186f9b39d66b4c104 /meta/classes-recipe
parent47ddb0f26db774495624c9687e11a88d25259cf9 (diff)
downloadpoky-d32dc08a77123517877f355b174606a357f746d5.tar.gz
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>
Diffstat (limited to 'meta/classes-recipe')
-rw-r--r--meta/classes-recipe/kernel-module-split.bbclass2
-rw-r--r--meta/classes-recipe/kernel.bbclass2
-rw-r--r--meta/classes-recipe/systemd.bbclass2
-rw-r--r--meta/classes-recipe/update-alternatives.bbclass2
-rw-r--r--meta/classes-recipe/update-rc.d.bbclass2
5 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes-recipe/kernel-module-split.bbclass b/meta/classes-recipe/kernel-module-split.bbclass
index 08c2e54e86..4943717487 100644
--- a/meta/classes-recipe/kernel-module-split.bbclass
+++ b/meta/classes-recipe/kernel-module-split.bbclass
@@ -35,7 +35,7 @@ do_install:append() {
35} 35}
36 36
37KERNEL_SPLIT_MODULES ?= "1" 37KERNEL_SPLIT_MODULES ?= "1"
38PACKAGESPLITFUNCS:prepend = "split_kernel_module_packages " 38PACKAGESPLITFUNCS =+ "split_kernel_module_packages "
39 39
40KERNEL_MODULES_META_PACKAGE ?= "${@ d.getVar("KERNEL_PACKAGE_NAME") or "kernel" }-modules" 40KERNEL_MODULES_META_PACKAGE ?= "${@ d.getVar("KERNEL_PACKAGE_NAME") or "kernel" }-modules"
41 41
diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass
index 553e17bb4e..c36632b0a7 100644
--- a/meta/classes-recipe/kernel.bbclass
+++ b/meta/classes-recipe/kernel.bbclass
@@ -705,7 +705,7 @@ pkg_postinst:${KERNEL_PACKAGE_NAME}-base () {
705 fi 705 fi
706} 706}
707 707
708PACKAGESPLITFUNCS:prepend = "split_kernel_packages " 708PACKAGESPLITFUNCS =+ "split_kernel_packages "
709 709
710python split_kernel_packages () { 710python split_kernel_packages () {
711 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='') 711 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='')
diff --git a/meta/classes-recipe/systemd.bbclass b/meta/classes-recipe/systemd.bbclass
index f6564c2b31..ae98043d29 100644
--- a/meta/classes-recipe/systemd.bbclass
+++ b/meta/classes-recipe/systemd.bbclass
@@ -205,7 +205,7 @@ python systemd_populate_packages() {
205 systemd_check_services() 205 systemd_check_services()
206} 206}
207 207
208PACKAGESPLITFUNCS:prepend = "systemd_populate_packages " 208PACKAGESPLITFUNCS =+ "systemd_populate_packages "
209 209
210python rm_systemd_unitdir (){ 210python rm_systemd_unitdir (){
211 import shutil 211 import shutil
diff --git a/meta/classes-recipe/update-alternatives.bbclass b/meta/classes-recipe/update-alternatives.bbclass
index 970d9bcd45..ec81763c89 100644
--- a/meta/classes-recipe/update-alternatives.bbclass
+++ b/meta/classes-recipe/update-alternatives.bbclass
@@ -265,7 +265,7 @@ def update_alternatives_alt_targets(d, pkg):
265 265
266 return updates 266 return updates
267 267
268PACKAGESPLITFUNCS:prepend = "populate_packages_updatealternatives " 268PACKAGESPLITFUNCS =+ "populate_packages_updatealternatives "
269 269
270python populate_packages_updatealternatives () { 270python populate_packages_updatealternatives () {
271 if not update_alternatives_enabled(d): 271 if not update_alternatives_enabled(d):
diff --git a/meta/classes-recipe/update-rc.d.bbclass b/meta/classes-recipe/update-rc.d.bbclass
index cb2aaba57c..a61d2c62ab 100644
--- a/meta/classes-recipe/update-rc.d.bbclass
+++ b/meta/classes-recipe/update-rc.d.bbclass
@@ -68,7 +68,7 @@ python __anonymous() {
68 update_rc_after_parse(d) 68 update_rc_after_parse(d)
69} 69}
70 70
71PACKAGESPLITFUNCS:prepend = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'populate_packages_updatercd ', '', d)}" 71PACKAGESPLITFUNCS =+ "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'populate_packages_updatercd ', '', d)}"
72PACKAGESPLITFUNCS:remove:class-nativesdk = "populate_packages_updatercd " 72PACKAGESPLITFUNCS:remove:class-nativesdk = "populate_packages_updatercd "
73 73
74populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_postinst" 74populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_postinst"