diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2023-01-05 22:05:46 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-12 23:08:58 +0000 |
| commit | d5668a7fd4d33d0d1670baeef58385c3acf4becd (patch) | |
| tree | ec974ed8be4c688bf5dd86e86ef13313b99afb46 /meta/classes-recipe | |
| parent | 8b77cb3a8272ed6ceefa8c0970298d57b2915adc (diff) | |
| download | poky-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/classes-recipe')
| -rw-r--r-- | meta/classes-recipe/kernel-module-split.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes-recipe/kernel.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes-recipe/systemd.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes-recipe/update-alternatives.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes-recipe/update-rc.d.bbclass | 4 |
5 files changed, 6 insertions, 6 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 | ||
| 37 | KERNEL_SPLIT_MODULES ?= "1" | 37 | KERNEL_SPLIT_MODULES ?= "1" |
| 38 | PACKAGESPLITFUNCS =+ "split_kernel_module_packages " | 38 | PACKAGESPLITFUNCS =+ "split_kernel_module_packages" |
| 39 | 39 | ||
| 40 | KERNEL_MODULES_META_PACKAGE ?= "${@ d.getVar("KERNEL_PACKAGE_NAME") or "kernel" }-modules" | 40 | KERNEL_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 | ||
| 708 | PACKAGESPLITFUNCS =+ "split_kernel_packages " | 708 | PACKAGESPLITFUNCS =+ "split_kernel_packages" |
| 709 | 709 | ||
| 710 | python split_kernel_packages () { | 710 | python 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 | ||
| 208 | PACKAGESPLITFUNCS =+ "systemd_populate_packages " | 208 | PACKAGESPLITFUNCS =+ "systemd_populate_packages" |
| 209 | 209 | ||
| 210 | python rm_systemd_unitdir (){ | 210 | python 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 | ||
| 268 | PACKAGESPLITFUNCS =+ "populate_packages_updatealternatives " | 268 | PACKAGESPLITFUNCS =+ "populate_packages_updatealternatives" |
| 269 | 269 | ||
| 270 | python populate_packages_updatealternatives () { | 270 | python 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 | ||
| 71 | PACKAGESPLITFUNCS =+ "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'populate_packages_updatercd ', '', d)}" | 71 | PACKAGESPLITFUNCS =+ "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'populate_packages_updatercd', '', d)}" |
| 72 | PACKAGESPLITFUNCS:remove:class-nativesdk = "populate_packages_updatercd " | 72 | PACKAGESPLITFUNCS:remove:class-nativesdk = "populate_packages_updatercd" |
| 73 | 73 | ||
| 74 | populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_postinst" | 74 | populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm updatercd_postinst" |
| 75 | populate_packages_updatercd[vardepsexclude] += "OVERRIDES" | 75 | populate_packages_updatercd[vardepsexclude] += "OVERRIDES" |
