On 2021. 10. 05. 12:18, Alexandre Belloni wrote:
Hello,
On 30/09/2021 16:14:43+0200, Zoltan Boszormenyi via lists.openembedded.org
wrote:
From: Zoltán Böszörményi <[email protected]>
This creates a circular dependency between the main kernel package
and its subpackages. It helps package managers to automatically
remove all kernel packages of the same version when upgrading.
Signed-off-by: Zoltán Böszörményi <[email protected]>
---
v2: No changes
v3: Add reverse RDEPENDS to subpackages unconditionally
Handle KERNEL_SPLIT_MODULES=1 (default) case in
meta/classes/kernel-module-split.bbclass
meta/classes/kernel-module-split.bbclass | 5 +++--
meta/classes/kernel.bbclass | 7 ++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/meta/classes/kernel-module-split.bbclass
b/meta/classes/kernel-module-split.bbclass
index a29c294810..2ddcea538c 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -176,8 +176,9 @@ python split_kernel_module_packages () {
module_pattern = module_pattern_prefix + kernel_package_name +
'-module-%s' + module_pattern_suffix
modules = do_split_packages(d, root='${nonarch_base_libdir}/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='%s-%s' % (kernel_package_name, kernel_version))
- if modules:
- d.appendVar('RDEPENDS:' + metapkg, ' '+' '.join(modules))
+ for mod in modules:
+ d.appendVar('RDEPENDS:' + metapkg, ' %s (= ${EXTENDPKGV})' % mod)
+ d.appendVar('RDEPENDS:' + mod, ' %s (= ${EXTENDPKGV})' %
kernel_package_name)
I believe this causes the following issues:
https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/4135/steps/18/logs/stdio
Error:
Problem: package hello-mod-0.1-r0.qemux86_64 requires
kernel-module-hello-5.14.6-yocto-standard = 0.1-r0, but none of the providers
can be installed
https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/2342/steps/11/logs/stdio
Error:
Problem: package lttng-tools-ptest-2.13.0-r0.cortexa57 requires
lttng-modules, but none of the providers can be installed
- package lttng-modules-2.13.0-r0.qemuarm64 requires
kernel-module-lttng-wrapper-5.14.6-yocto-standard = 2.13.0-r0, but none of the
providers can be installed
- conflicting requests
- nothing provides kernel = 2.13.0-r0 needed by
kernel-module-lttng-wrapper-5.14.6-yocto-standard-2.13.0-r0.qemuarm64
(try to add '--skip-broken' to skip uninstallable packages)
Arrggh. Externally built modules?
That exact ${EXTENDPKGV} match was intended only for
the kernel and its own modules.
An extra opt-out knob should be devised to be used
by such individual module recipes because their
full version may not match the kernel's.
# If modules-load.d and modprobe.d are empty at this point, remove them to
# avoid warnings. removedirs only raises an OSError if an empty
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 4acec1877e..afd9f8045e 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -98,7 +98,9 @@ python __anonymous () {
typelower = type.lower()
d.appendVar('PACKAGES', ' %s-image-%s' % (kname, typelower))
d.setVar('FILES:' + kname + '-image-' + typelower, '/' + imagedest +
'/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type)
+ d.appendVar('RDEPENDS:%s-image' % kname, ' %s (= ${EXTENDPKGV})' %
kname)
d.appendVar('RDEPENDS:%s-image' % kname, ' %s-image-%s (=
${EXTENDPKGV})' % (kname, typelower))
+ d.appendVar('RDEPENDS:%s-image-%s' % (kname, typelower), ' %s (=
${EXTENDPKGV})' % kname)
splitmods = d.getVar("KERNEL_SPLIT_MODULES")
if splitmods != '1':
d.appendVar('RDEPENDS:%s-image' % kname, ' %s-modules (=
${EXTENDPKGV})' % kname)
@@ -627,8 +629,11 @@ RDEPENDS:${KERNEL_PACKAGE_NAME} =
"${KERNEL_PACKAGE_NAME}-base (= ${EXTENDPKGV})
# Allow machines to override this dependency if kernel image files are
# not wanted in images as standard
RDEPENDS:${KERNEL_PACKAGE_NAME}-base ?= "${KERNEL_PACKAGE_NAME}-image (=
${EXTENDPKGV})"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append = " ${KERNEL_PACKAGE_NAME} (=
${EXTENDPKGV})"
PKG:${KERNEL_PACKAGE_NAME}-image =
"${KERNEL_PACKAGE_NAME}-image-${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-image +=
"${@oe.utils.conditional('KERNEL_IMAGETYPE', 'vmlinux',
'${KERNEL_PACKAGE_NAME}-vmlinux (= ${EXTENDPKGV})', '', d)}"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-image:append =
"${@oe.utils.conditional('KERNEL_IMAGETYPE', 'vmlinux', '
${KERNEL_PACKAGE_NAME}-vmlinux (= ${EXTENDPKGV})', '', d)}"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-vmlinux:append =
"${@oe.utils.conditional('KERNEL_IMAGETYPE', 'vmlinux', ' ${KERNEL_PACKAGE_NAME} (=
${EXTENDPKGV})', '', d)}"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-modules:append = " ${KERNEL_PACKAGE_NAME} (=
${EXTENDPKGV})"
PKG:${KERNEL_PACKAGE_NAME}-base =
"${KERNEL_PACKAGE_NAME}-${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}"
RPROVIDES:${KERNEL_PACKAGE_NAME}-base +=
"${KERNEL_PACKAGE_NAME}-${KERNEL_VERSION}"
ALLOW_EMPTY:${KERNEL_PACKAGE_NAME} = "1"
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#156642):
https://lists.openembedded.org/g/openembedded-core/message/156642
Mute This Topic: https://lists.openembedded.org/mt/85974630/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
