summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-07-17 12:37:57 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-10-17 08:55:09 +0200
commite77646bc2cf905fd671fc5c19ab6fd17f9b94b3f (patch)
treeedfc92c7115af3433d160251c0e48715e1292b08
parent7166388210fd232f707be9467dba7c2e8969b8cb (diff)
downloadmeta-openembedded-e77646bc2cf905fd671fc5c19ab6fd17f9b94b3f.tar.gz
kernel.bbclass: add non-santized kernel provides
If the kernel version string uses characters or symbols that need to be santized for the package name, we can end up with a mismatch between module requirements and what the kernel provides. The kernel version is pulled from utsrelease.h, which contains the exact string that was passed to the kernel build, not one that is santized, this can result in: echo "CONFIG_LOCALVERSION="\"MYVER+snapshot_standard\" >> ${B}/.config <build> % rpm -qp kernel-module-uvesafb-3.4-r0.qemux86.rpm --requires update-modules kernel-3.4.3-MYVER+snapshot_standard % rpm -qp kernel-3.4.3-myver+snapshot-standard-3.4-r0.qemux86.rpm --provides kernel-3.4.3-myver+snapshot-standard = 3.4-r0 At rootfs assembly time, we'll have a dependency issue with the kernel providing the santizied string and the modules requiring the utsrelease.h string. To not break existing use cases, we can add a second provides to the kernel packaging with the unsantized version string, and allowing the kernel module packaging to be unchanged. RPROVIDES_kernel-base += "kernel-${KERNEL_VERSION}" % rpm -qp kernel-3.4.3-myver+snapshot-standard-3.4-r0.qemux86.rpm --provides kernel-3.4.3-MYVER+snapshot_standard kernel-3.4.3-myver+snapshot-standard = 3.4-r0 Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--meta-oe/classes/kernel.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
index 19fc4c6c1..7b80e9a79 100644
--- a/meta-oe/classes/kernel.bbclass
+++ b/meta-oe/classes/kernel.bbclass
@@ -265,6 +265,7 @@ RDEPENDS_kernel = "kernel-base"
265RDEPENDS_kernel-base ?= "kernel-image" 265RDEPENDS_kernel-base ?= "kernel-image"
266PKG_kernel-image = "kernel-image-${@legitimize_package_name('${KERNEL_VERSION}')}" 266PKG_kernel-image = "kernel-image-${@legitimize_package_name('${KERNEL_VERSION}')}"
267PKG_kernel-base = "kernel-${@legitimize_package_name('${KERNEL_VERSION}')}" 267PKG_kernel-base = "kernel-${@legitimize_package_name('${KERNEL_VERSION}')}"
268RPROVIDES_kernel-base += "kernel-${KERNEL_VERSION}"
268ALLOW_EMPTY_kernel = "1" 269ALLOW_EMPTY_kernel = "1"
269ALLOW_EMPTY_kernel-base = "1" 270ALLOW_EMPTY_kernel-base = "1"
270ALLOW_EMPTY_kernel-image = "1" 271ALLOW_EMPTY_kernel-image = "1"