From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Cc: Bruce Ashfield <bruce.ashfield@windriver.com>
Subject: [meta-oe][PATCH 4/7] kernel.bbclass: add non-santized kernel provides
Date: Tue, 17 Jul 2012 14:37:57 +0200 [thread overview]
Message-ID: <1342528680-6336-4-git-send-email-Martin.Jansa@gmail.com> (raw)
In-Reply-To: <1342528680-6336-1-git-send-email-Martin.Jansa@gmail.com>
From: Bruce Ashfield <bruce.ashfield@windriver.com>
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>
---
meta-oe/classes/kernel.bbclass | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta-oe/classes/kernel.bbclass b/meta-oe/classes/kernel.bbclass
index 4a6f660..de43550 100644
--- a/meta-oe/classes/kernel.bbclass
+++ b/meta-oe/classes/kernel.bbclass
@@ -262,6 +262,7 @@ RDEPENDS_kernel = "kernel-base"
RDEPENDS_kernel-base ?= "kernel-image"
PKG_kernel-image = "kernel-image-${@legitimize_package_name('${KERNEL_VERSION}')}"
PKG_kernel-base = "kernel-${@legitimize_package_name('${KERNEL_VERSION}')}"
+RPROVIDES_kernel-base += "kernel-${KERNEL_VERSION}"
ALLOW_EMPTY_kernel = "1"
ALLOW_EMPTY_kernel-base = "1"
ALLOW_EMPTY_kernel-image = "1"
--
1.7.8.6
next prev parent reply other threads:[~2012-07-17 12:49 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-16 17:38 [RFC][meta-oe][PATCH 1/3] kernel.bbclass: Rename to machine_kernel_pr.bbclass which provides added functionality Khem Raj
2012-07-16 17:38 ` [RFC][meta-oe][PATCH 2/3] testlab.bbclass: Delete Khem Raj
2012-07-16 17:38 ` [RFC][meta-oe][PATCH 3/3] blacklist.bbclass: Move to meta-angstrom Khem Raj
2012-07-16 17:46 ` Martin Jansa
2012-07-16 17:50 ` Khem Raj
2012-07-16 17:58 ` Martin Jansa
2012-07-16 18:00 ` Khem Raj
2012-07-16 18:04 ` Martin Jansa
2012-07-18 11:25 ` Martin Jansa
2012-07-16 17:50 ` [RFC][meta-oe][PATCH 1/3] kernel.bbclass: Rename to machine_kernel_pr.bbclass which provides added functionality Martin Jansa
2012-07-16 17:55 ` Khem Raj
2012-07-17 12:39 ` Martin Jansa
2012-07-17 12:37 ` [meta-oe][PATCH 1/7] kernel: save $kerndir/tools and $kerndir/lib from pruning Martin Jansa
2012-07-17 12:37 ` [meta-oe][PATCH 2/7] recipes-kernel: make perf a standalone package Martin Jansa
2012-07-17 12:37 ` [meta-oe][PATCH 3/7] kernel: Add kernel headers to kernel-dev package Martin Jansa
2012-07-17 12:37 ` Martin Jansa [this message]
2012-07-17 12:37 ` [meta-oe][PATCH 5/7] kernel.bbclass: Dont package kxgettext.o Martin Jansa
2012-07-17 12:37 ` [meta-oe][PATCH 6/7] kernel.bbclass: add deploy link to KERNEL_IMAGETYPE Martin Jansa
2012-07-17 12:38 ` [meta-oe][PATCH 7/7] kernel.bbclass: replace os.system with subprocess.call Martin Jansa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1342528680-6336-4-git-send-email-Martin.Jansa@gmail.com \
--to=martin.jansa@gmail.com \
--cc=bruce.ashfield@windriver.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.