recipes, classes: Avoid adding extra whitespace to PACKAGESPLITFUNCS
A message that is not in the archive (sent off-list or not yet received): [email protected]
*ping*
//Peter
Quoted 197 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 5 januari 2023 22:06
To: [email protected]
Subject: [OE-core] [PATCH] recipes, classes: Avoid adding extra whitespace to PACKAGESPLITFUNCSThis is a follow-up to commit
846ff49465to remove the extra whitespace that is no longer needed after converting :append and :prepend to += and
=+.Signed-off-by Peter Kjellerstedt <[email protected]>--- meta/classes-recipe/kernel-module-split.bbclass | 2 +- meta/classes-recipe/kernel.bbclass | 2 +- meta/classes-recipe/systemd.bbclass | 2 +- meta/classes-recipe/update-alternatives.bbclass | 2 +- meta/classes-recipe/update-rc.d.bbclass | 4 ++-- .../wpa-supplicant/wpa-supplicant_2.10.bb | 2 +- meta/recipes-devtools/perl/perl_5.36.0.bb | 2 +- meta/recipes-graphics/mesa/mesa.inc | 2 +- .../gstreamer/gstreamer1.0-plugins-license.inc | 2 +- .../gstreamer/gstreamer1.0-plugins-packaging.inc | 4 ++-- meta/recipes-support/libevent/libevent_2.1.12.bb | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-)meta/classes-recipe/kernel-module-split.bbclass +1
-1@@ -35,7 +35,7 @@ do_install:append() { } KERNEL_SPLIT_MODULES ?= "1" -PACKAGESPLITFUNCS =+ "split_kernel_module_packages " +PACKAGESPLITFUNCS =+ "split_kernel_module_packages" KERNEL_MODULES_META_PACKAGE ?= "${@ d.getVar("KERNEL_PACKAGE_NAME") or"kernel" }-modules"
meta/classes- renamed from meta/classes-recipe/kernel.bbclass +0
-0recipe/kernel.bbclass
indexc36632b0a7..bd3b6471c6100644meta/classes-recipe/kernel.bbclass +1
-1@@ -705,7 +705,7 @@ pkg_postinst:${KERNEL_PACKAGE_NAME}-base () { fi } -PACKAGESPLITFUNCS =+ "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='')
meta/classes- renamed from meta/classes-recipe/systemd.bbclass +0
-0recipe/systemd.bbclass
indexae98043d29..f9c92e6c2a100644meta/classes-recipe/systemd.bbclass +1
-1@@ -205,7 +205,7 @@ python systemd_populate_packages() { systemd_check_services() } -PACKAGESPLITFUNCS =+ "systemd_populate_packages " +PACKAGESPLITFUNCS =+ "systemd_populate_packages" python rm_systemd_unitdir (){ import shutilmeta/classes-recipe/update-alternatives.bbclass +1
-1@@ -265,7 +265,7 @@ def update_alternatives_alt_targets(d, pkg): return updates -PACKAGESPLITFUNCS =+ "populate_packages_updatealternatives " +PACKAGESPLITFUNCS =+ "populate_packages_updatealternatives" python populate_packages_updatealternatives () { if not update_alternatives_enabled(d):meta/classes- renamed from meta/classes-recipe/update-rc.d.bbclass +0
-0recipe/update-rc.d.bbclass
indexa61d2c62ab..a19e704741100644meta/classes-recipe/update-rc.d.bbclass +0
-1@@ -68,8 +68,8 @@ python __anonymous() { update_rc_after_parse(d) } -PACKAGESPLITFUNCS =+ "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit','
populate_packages_updatercd', '', d)}"meta/classes-recipe/update-rc.d.bbclass +1
-1-PACKAGESPLITFUNCS:remove:class-nativesdk = "populate_packages_updatercd " +PACKAGESPLITFUNCS =+ "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit','
populate_packages_updatercd', '', d)}" +PACKAGESPLITFUNCS:remove:class-nativesdk = "populate_packages_updatercd"populate_packages_updatercd[vardeps] += "
updatercd_prermupdatercd_postrmupdatercd_postinst"
populate_packages_updatercd[vardepsexclude] += "OVERRIDES"(quoted diff) +0
-0supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa- supplicant_2.10.bb
index254cfd3f0c..46604045da100644meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +0
-0@@ -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))}
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +1
-1-PACKAGESPLITFUNCS += "split_wpa_supplicant_libs " +PACKAGESPLITFUNCS += "split_wpa_supplicant_libs"meta/recipes- renamed from meta/recipes-devtools/perl/perl_5.36.0.bb +0
-0devtools/perl/perl_5.36.0.bb
index3458e6a5b0..4d8a919d1e100644meta/recipes-devtools/perl/perl_5.36.0.bb +0
-0@@ -302,7 +302,7 @@ ALTERNATIVE_LINK_NAME[Thread.3] ="${mandir}/man3/Thread.3"
ALLOW_EMPTY:${PN}-modules = "1"
PACKAGES += "${PN}-modules "meta/recipes-devtools/perl/perl_5.36.0.bb +1
-1-PACKAGESPLITFUNCS =+ "split_perl_packages " +PACKAGESPLITFUNCS =+ "split_perl_packages" python split_perl_packages () { libdir = d.expand('${libdir}/perl5/${PV}')meta/recipes- renamed from meta/recipes-graphics/mesa/mesa.inc +0
-0graphics/mesa/mesa.inc
index2535dd403d..77aa97069a100644meta/recipes-graphics/mesa/mesa.inc +1
-1@@ -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 =+ "mesa_populate_packages " +PACKAGESPLITFUNCS =+ "mesa_populate_packages" PACKAGES_DYNAMIC += "^mesa-driver-.*"PACKAGES_DYNAMIC:class-native = "^mesa-driver-.*-native"
(quoted diff) +0
-0license.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins- license.inc
index03595e7d32..8b1c001111100644meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc +1
-1@@ -1,7 +1,7 @@ # This .inc file contains functionality for automatically setting # the the license of all plugins according to the GSTREAMER_GPL. -PACKAGESPLITFUNCS += " set_gstreamer_license " +PACKAGESPLITFUNCS += "set_gstreamer_license" python set_gstreamer_license () { import oe.utils(quoted diff) +0
-0packaging.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins- packaging.inc
index837d5a1a62..d77aeed8a2100644meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc +2
-2@@ -9,8 +9,8 @@ # Dynamically generate packages for all enabled plugins PACKAGES_DYNAMIC = "^${PN}-.* ^libgst.*" -PACKAGESPLITFUNCS =+ " split_gstreamer10_packages " -PACKAGESPLITFUNCS += " 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')meta/recipes-support/libevent/libevent_2.1.12.bb +1
-1@@ -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 =+ "split_libevent_libs " +PACKAGESPLITFUNCS =+ "split_libevent_libs" BBCLASSEXTEND = "native nativesdk"
This was under testing for a while and I couldn't get a successful build until today. I've now sent it to Richard.
Quoted 211 lines · Peter Kjellerstedt
*ping*
//Peter
Quoted 189 lines
-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 5 januari 2023 22:06
To: [email protected]
Subject: [OE-core] [PATCH] recipes, classes: Avoid adding extra whitespace to PACKAGESPLITFUNCSThis is a follow-up to commit
846ff49465to remove the extra whitespace that is no longer needed after converting :append and :prepend to += and
=+.Signed-off-by Peter Kjellerstedt <[email protected]>--- meta/classes-recipe/kernel-module-split.bbclass | 2 +- meta/classes-recipe/kernel.bbclass | 2 +- meta/classes-recipe/systemd.bbclass | 2 +- meta/classes-recipe/update-alternatives.bbclass | 2 +- meta/classes-recipe/update-rc.d.bbclass | 4 ++-- .../wpa-supplicant/wpa-supplicant_2.10.bb | 2 +- meta/recipes-devtools/perl/perl_5.36.0.bb | 2 +- meta/recipes-graphics/mesa/mesa.inc | 2 +- .../gstreamer/gstreamer1.0-plugins-license.inc | 2 +- .../gstreamer/gstreamer1.0-plugins-packaging.inc | 4 ++-- meta/recipes-support/libevent/libevent_2.1.12.bb | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-)meta/classes-recipe/kernel-module-split.bbclass +1
-1@@ -35,7 +35,7 @@ do_install:append() { } KERNEL_SPLIT_MODULES ?= "1" -PACKAGESPLITFUNCS =+ "split_kernel_module_packages " +PACKAGESPLITFUNCS =+ "split_kernel_module_packages" KERNEL_MODULES_META_PACKAGE ?= "${@ d.getVar("KERNEL_PACKAGE_NAME") or"kernel" }-modules"
meta/classes- renamed from meta/classes-recipe/kernel.bbclass +0
-0recipe/kernel.bbclass
indexc36632b0a7..bd3b6471c6100644meta/classes-recipe/kernel.bbclass +1
-1@@ -705,7 +705,7 @@ pkg_postinst:${KERNEL_PACKAGE_NAME}-base () { fi } -PACKAGESPLITFUNCS =+ "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='')
meta/classes- renamed from meta/classes-recipe/systemd.bbclass +0
-0recipe/systemd.bbclass
indexae98043d29..f9c92e6c2a100644meta/classes-recipe/systemd.bbclass +1
-1@@ -205,7 +205,7 @@ python systemd_populate_packages() { systemd_check_services() } -PACKAGESPLITFUNCS =+ "systemd_populate_packages " +PACKAGESPLITFUNCS =+ "systemd_populate_packages" python rm_systemd_unitdir (){ import shutilmeta/classes-recipe/update-alternatives.bbclass +1
-1@@ -265,7 +265,7 @@ def update_alternatives_alt_targets(d, pkg): return updates -PACKAGESPLITFUNCS =+ "populate_packages_updatealternatives " +PACKAGESPLITFUNCS =+ "populate_packages_updatealternatives" python populate_packages_updatealternatives () { if not update_alternatives_enabled(d):meta/classes- renamed from meta/classes-recipe/update-rc.d.bbclass +0
-0recipe/update-rc.d.bbclass
indexa61d2c62ab..a19e704741100644meta/classes-recipe/update-rc.d.bbclass +0
-1@@ -68,8 +68,8 @@ python __anonymous() { update_rc_after_parse(d) } -PACKAGESPLITFUNCS =+ "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit','
populate_packages_updatercd', '', d)}"meta/classes-recipe/update-rc.d.bbclass +1
-1-PACKAGESPLITFUNCS:remove:class-nativesdk = "populate_packages_updatercd " +PACKAGESPLITFUNCS =+ "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit','
populate_packages_updatercd', '', d)}" +PACKAGESPLITFUNCS:remove:class-nativesdk = "populate_packages_updatercd"populate_packages_updatercd[vardeps] += "
updatercd_prermupdatercd_postrmupdatercd_postinst"
populate_packages_updatercd[vardepsexclude] += "OVERRIDES"(quoted diff) +0
-0supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa- supplicant_2.10.bb
index254cfd3f0c..46604045da100644meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +0
-0@@ -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))}
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +1
-1-PACKAGESPLITFUNCS += "split_wpa_supplicant_libs " +PACKAGESPLITFUNCS += "split_wpa_supplicant_libs"meta/recipes- renamed from meta/recipes-devtools/perl/perl_5.36.0.bb +0
-0devtools/perl/perl_5.36.0.bb
index3458e6a5b0..4d8a919d1e100644meta/recipes-devtools/perl/perl_5.36.0.bb +0
-0@@ -302,7 +302,7 @@ ALTERNATIVE_LINK_NAME[Thread.3] ="${mandir}/man3/Thread.3"
ALLOW_EMPTY:${PN}-modules = "1"
PACKAGES += "${PN}-modules "meta/recipes-devtools/perl/perl_5.36.0.bb +1
-1-PACKAGESPLITFUNCS =+ "split_perl_packages " +PACKAGESPLITFUNCS =+ "split_perl_packages" python split_perl_packages () { libdir = d.expand('${libdir}/perl5/${PV}')meta/recipes- renamed from meta/recipes-graphics/mesa/mesa.inc +0
-0graphics/mesa/mesa.inc
index2535dd403d..77aa97069a100644meta/recipes-graphics/mesa/mesa.inc +1
-1@@ -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 =+ "mesa_populate_packages " +PACKAGESPLITFUNCS =+ "mesa_populate_packages" PACKAGES_DYNAMIC += "^mesa-driver-.*"PACKAGES_DYNAMIC:class-native = "^mesa-driver-.*-native"
(quoted diff) +0
-0license.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins- license.inc
index03595e7d32..8b1c001111100644meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc +1
-1@@ -1,7 +1,7 @@ # This .inc file contains functionality for automatically setting # the the license of all plugins according to the GSTREAMER_GPL. -PACKAGESPLITFUNCS += " set_gstreamer_license " +PACKAGESPLITFUNCS += "set_gstreamer_license" python set_gstreamer_license () { import oe.utils(quoted diff) +0
-0packaging.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins- packaging.inc
index837d5a1a62..d77aeed8a2100644meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc +2
-2@@ -9,8 +9,8 @@ # Dynamically generate packages for all enabled plugins PACKAGES_DYNAMIC = "^${PN}-.* ^libgst.*" -PACKAGESPLITFUNCS =+ " split_gstreamer10_packages " -PACKAGESPLITFUNCS += " 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')meta/recipes-support/libevent/libevent_2.1.12.bb +0
-0meta/recipes-support/libevent/libevent_2.1.12.bb PACKAGES_DYNAMIC = "^${PN}-.*$" · line 47
Quoted 8 lines
meta/recipes-support/libevent/libevent_2.1.12.bb +1
-1@@ -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 =+ "split_libevent_libs " +PACKAGESPLITFUNCS =+ "split_libevent_libs" BBCLASSEXTEND = "native nativesdk"-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#175798): https://lists.openembedded.org/g/openembedded-core/message/175798
Mute This Topic: https://lists.openembedded.org/mt/96081294/3617179
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com