summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2023-01-05 22:05:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-12 23:08:58 +0000
commitd5668a7fd4d33d0d1670baeef58385c3acf4becd (patch)
treeec974ed8be4c688bf5dd86e86ef13313b99afb46 /meta
parent8b77cb3a8272ed6ceefa8c0970298d57b2915adc (diff)
downloadpoky-d5668a7fd4d33d0d1670baeef58385c3acf4becd.tar.gz
recipes, classes: Avoid adding extra whitespace to PACKAGESPLITFUNCS
This is a follow-up to commit 846ff49465 to remove the extra whitespace that is no longer needed after converting :append and :prepend to += and =+. (From OE-Core rev: 5a38be49e451c9f9d973b10a33c3972507f7b18a) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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.bbclass4
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb2
-rw-r--r--meta/recipes-devtools/perl/perl_5.36.0.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc4
-rw-r--r--meta/recipes-support/libevent/libevent_2.1.12.bb2
11 files changed, 13 insertions, 13 deletions
diff --git a/meta/classes-recipe/kernel-module-split.bbclass b/meta/classes-recipe/kernel-module-split.bbclass
index 4943717487..50882c31a7 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 =+ "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 c36632b0a7..bd3b6471c6 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 =+ "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 ae98043d29..f9c92e6c2a 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 =+ "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 ec81763c89..55e0b954d6 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 =+ "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 a61d2c62ab..a19e704741 100644
--- a/meta/classes-recipe/update-rc.d.bbclass
+++ b/meta/classes-recipe/update-rc.d.bbclass
@@ -68,8 +68,8 @@ python __anonymous() {
68 update_rc_after_parse(d) 68 update_rc_after_parse(d)
69} 69}
70 70
71PACKAGESPLITFUNCS =+ "${@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"
75populate_packages_updatercd[vardepsexclude] += "OVERRIDES" 75populate_packages_updatercd[vardepsexclude] += "OVERRIDES"
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb
index 254cfd3f0c..46604045da 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb
@@ -134,4 +134,4 @@ python split_wpa_supplicant_libs () {
134 d.setVar('RRECOMMENDS:' + pn + '-plugins', ' '.join(split_packages)) 134 d.setVar('RRECOMMENDS:' + pn + '-plugins', ' '.join(split_packages))
135 d.appendVar('RRECOMMENDS:' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages)) 135 d.appendVar('RRECOMMENDS:' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages))
136} 136}
137PACKAGESPLITFUNCS += "split_wpa_supplicant_libs " 137PACKAGESPLITFUNCS += "split_wpa_supplicant_libs"
diff --git a/meta/recipes-devtools/perl/perl_5.36.0.bb b/meta/recipes-devtools/perl/perl_5.36.0.bb
index 3458e6a5b0..4d8a919d1e 100644
--- a/meta/recipes-devtools/perl/perl_5.36.0.bb
+++ b/meta/recipes-devtools/perl/perl_5.36.0.bb
@@ -302,7 +302,7 @@ ALTERNATIVE_LINK_NAME[Thread.3] = "${mandir}/man3/Thread.3"
302ALLOW_EMPTY:${PN}-modules = "1" 302ALLOW_EMPTY:${PN}-modules = "1"
303PACKAGES += "${PN}-modules " 303PACKAGES += "${PN}-modules "
304 304
305PACKAGESPLITFUNCS =+ "split_perl_packages " 305PACKAGESPLITFUNCS =+ "split_perl_packages"
306 306
307python split_perl_packages () { 307python split_perl_packages () {
308 libdir = d.expand('${libdir}/perl5/${PV}') 308 libdir = d.expand('${libdir}/perl5/${PV}')
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 2535dd403d..77aa97069a 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -291,7 +291,7 @@ python mesa_populate_packages() {
291 do_split_packages(d, pipe_drivers_root, r'^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') 291 do_split_packages(d, pipe_drivers_root, r'^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
292} 292}
293 293
294PACKAGESPLITFUNCS =+ "mesa_populate_packages " 294PACKAGESPLITFUNCS =+ "mesa_populate_packages"
295 295
296PACKAGES_DYNAMIC += "^mesa-driver-.*" 296PACKAGES_DYNAMIC += "^mesa-driver-.*"
297PACKAGES_DYNAMIC:class-native = "^mesa-driver-.*-native" 297PACKAGES_DYNAMIC:class-native = "^mesa-driver-.*-native"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc
index 03595e7d32..8b1c001111 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc
@@ -1,7 +1,7 @@
1# This .inc file contains functionality for automatically setting 1# This .inc file contains functionality for automatically setting
2# the the license of all plugins according to the GSTREAMER_GPL. 2# the the license of all plugins according to the GSTREAMER_GPL.
3 3
4PACKAGESPLITFUNCS += " set_gstreamer_license " 4PACKAGESPLITFUNCS += "set_gstreamer_license"
5 5
6python set_gstreamer_license () { 6python set_gstreamer_license () {
7 import oe.utils 7 import oe.utils
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc
index 837d5a1a62..d77aeed8a2 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc
@@ -9,8 +9,8 @@
9# Dynamically generate packages for all enabled plugins 9# Dynamically generate packages for all enabled plugins
10PACKAGES_DYNAMIC = "^${PN}-.* ^libgst.*" 10PACKAGES_DYNAMIC = "^${PN}-.* ^libgst.*"
11 11
12PACKAGESPLITFUNCS =+ " split_gstreamer10_packages " 12PACKAGESPLITFUNCS =+ "split_gstreamer10_packages"
13PACKAGESPLITFUNCS += " set_gstreamer10_metapkg_rdepends " 13PACKAGESPLITFUNCS += "set_gstreamer10_metapkg_rdepends"
14 14
15python split_gstreamer10_packages () { 15python split_gstreamer10_packages () {
16 gst_libdir = d.expand('${libdir}/gstreamer-1.0') 16 gst_libdir = d.expand('${libdir}/gstreamer-1.0')
diff --git a/meta/recipes-support/libevent/libevent_2.1.12.bb b/meta/recipes-support/libevent/libevent_2.1.12.bb
index 88b81fd56e..25388fb4d7 100644
--- a/meta/recipes-support/libevent/libevent_2.1.12.bb
+++ b/meta/recipes-support/libevent/libevent_2.1.12.bb
@@ -41,7 +41,7 @@ PACKAGES_DYNAMIC = "^${PN}-.*$"
41python split_libevent_libs () { 41python split_libevent_libs () {
42 do_split_packages(d, '${libdir}', r'^libevent_([a-z]*)-.*\.so\..*', '${PN}-%s', '${SUMMARY} (%s)', prepend=True, allow_links=True) 42 do_split_packages(d, '${libdir}', r'^libevent_([a-z]*)-.*\.so\..*', '${PN}-%s', '${SUMMARY} (%s)', prepend=True, allow_links=True)
43} 43}
44PACKAGESPLITFUNCS =+ "split_libevent_libs " 44PACKAGESPLITFUNCS =+ "split_libevent_libs"
45 45
46BBCLASSEXTEND = "native nativesdk" 46BBCLASSEXTEND = "native nativesdk"
47 47