diff options
| -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 | 2 | ||||
| -rw-r--r-- | meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/perl/perl_5.36.0.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-license.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-packaging.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-support/libevent/libevent_2.1.12.bb | 2 |
11 files changed, 12 insertions, 12 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 | ||
| 37 | KERNEL_SPLIT_MODULES ?= "1" | 37 | KERNEL_SPLIT_MODULES ?= "1" |
| 38 | PACKAGESPLITFUNCS:prepend = "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 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 | ||
| 708 | PACKAGESPLITFUNCS:prepend = "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 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 | ||
| 208 | PACKAGESPLITFUNCS:prepend = "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 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 | ||
| 268 | PACKAGESPLITFUNCS:prepend = "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 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 | ||
| 71 | PACKAGESPLITFUNCS:prepend = "${@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" |
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 4e27b92bc6..254cfd3f0c 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 | } |
| 137 | PACKAGESPLITFUNCS:prepend = "split_wpa_supplicant_libs " | 137 | PACKAGESPLITFUNCS += "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 2dc558aaa5..3458e6a5b0 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" | |||
| 302 | ALLOW_EMPTY:${PN}-modules = "1" | 302 | ALLOW_EMPTY:${PN}-modules = "1" |
| 303 | PACKAGES += "${PN}-modules " | 303 | PACKAGES += "${PN}-modules " |
| 304 | 304 | ||
| 305 | PACKAGESPLITFUNCS:prepend = "split_perl_packages " | 305 | PACKAGESPLITFUNCS =+ "split_perl_packages " |
| 306 | 306 | ||
| 307 | python split_perl_packages () { | 307 | python 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 93b3b59a91..2535dd403d 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 | ||
| 294 | PACKAGESPLITFUNCS:prepend = "mesa_populate_packages " | 294 | PACKAGESPLITFUNCS =+ "mesa_populate_packages " |
| 295 | 295 | ||
| 296 | PACKAGES_DYNAMIC += "^mesa-driver-.*" | 296 | PACKAGES_DYNAMIC += "^mesa-driver-.*" |
| 297 | PACKAGES_DYNAMIC:class-native = "^mesa-driver-.*-native" | 297 | PACKAGES_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 6638f13540..03595e7d32 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 | ||
| 4 | PACKAGESPLITFUNCS:append = " set_gstreamer_license " | 4 | PACKAGESPLITFUNCS += " set_gstreamer_license " |
| 5 | 5 | ||
| 6 | python set_gstreamer_license () { | 6 | python 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 afc7be40c8..837d5a1a62 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 |
| 10 | PACKAGES_DYNAMIC = "^${PN}-.* ^libgst.*" | 10 | PACKAGES_DYNAMIC = "^${PN}-.* ^libgst.*" |
| 11 | 11 | ||
| 12 | PACKAGESPLITFUNCS:prepend = " split_gstreamer10_packages " | 12 | PACKAGESPLITFUNCS =+ " split_gstreamer10_packages " |
| 13 | PACKAGESPLITFUNCS:append = " set_gstreamer10_metapkg_rdepends " | 13 | PACKAGESPLITFUNCS += " set_gstreamer10_metapkg_rdepends " |
| 14 | 14 | ||
| 15 | python split_gstreamer10_packages () { | 15 | python 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 55a65e6c08..88b81fd56e 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}-.*$" | |||
| 41 | python split_libevent_libs () { | 41 | python 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 | } |
| 44 | PACKAGESPLITFUNCS:prepend = "split_libevent_libs " | 44 | PACKAGESPLITFUNCS =+ "split_libevent_libs " |
| 45 | 45 | ||
| 46 | BBCLASSEXTEND = "native nativesdk" | 46 | BBCLASSEXTEND = "native nativesdk" |
| 47 | 47 | ||
