[OE-core] [oe-core][PATCH 4/6] kernel.bbclass: fix extra + in kernelrelease

[Martin Jansa]

On Mon, Mar 26, 2012 at 06:02:46PM +0200, Martin Jansa wrote:
> On Fri, Mar 23, 2012 at 02:31:02PM +0100, Martin Jansa wrote:
> > On Fri, Mar 23, 2012 at 09:24:56AM -0400, Bruce Ashfield wrote:
> > > On 12-03-23 08:56 AM, Martin Jansa wrote:
> > > > * see http://lists.linuxtogo.org/pipermail/openembedded-core/2011-December/014308.html
> > > 
> > > I was just looking at this in the past day or so and was
> > > wondering where it had gone. Saved me the effort!
> > > 
> > 
> > Please bump PR in kernel recipes you care about (I did for mine.. )
> 
> I was testing your patch
> "linux-yocto: common-pc: Add PCNET32 to the config"
> to see if this patch fixes + also in linux-yocto recipes and somehow it
> seems still keeping +
> 
> OE @ ~/shr-core/tmp-eglibc/work/qemux86_64-oe-linux/linux-yocto/linux-yocto-3.2.11+git6+867fc7a19f2ea74253d1f20c3d61b7829635175b_4+4ca7e2c5d42e755e1b4c3e1478128f047a8ed2a8-r1/linux-qemux86-64-standard-build
> $ ../linux/scripts/setlocalversion .
> -yocto-standard
> 
> seems ok, but
> root at qemux86-64:/lib/modules# opkg files kernel-module-uvesafb
> Package kernel-module-uvesafb
> (3.2.11+git6+867fc7a19f2ea74253d1f20c3d61b7829635175b_4+4ca7e2c5d42e755e1b4c3e1478128f047a8ed2a8-r1)
> is installed on root and has the following files:
> /lib/modules/
> /lib/modules/3.2.11-yocto-standard+/kernel/drivers/video/
> /lib/modules/3.2.11-yocto-standard+/kernel/drivers/video/uvesafb.ko
> 
> and also:
> OE @ ~/shr-core/tmp-eglibc/work/qemux86_64-oe-linux/linux-yocto/linux-yocto-3.2.11+git6+867fc7a19f2ea74253d1f20c3d61b7829635175b_4+4ca7e2c5d42e755e1b4c3e1478128f047a8ed2a8-r1/linux-qemux86-64-standard-build
> $ make kernelrelease
>   GEN
> /OE/shr-core/tmp-eglibc/work/qemux86_64-oe-linux/linux-yocto/linux-yocto-3.2.11+git6+867fc7a19f2ea74253d1f20c3d61b7829635175b_4+4ca7e2c5d42e755e1b4c3e1478128f047a8ed2a8-r1/linux-qemux86-64-standard-build/Makefile
> scripts/kconfig/conf --silentoldconfig Kconfig
> 3.2.11-yocto-standard+
> 
> Any idea why it doesn't work with linux-yocto layout and works with
> other kernels from git (tested on kernels from meta-smartphone).

Just one more note to this

OE @
~/shr-core/tmp-eglibc/work/qemux86_64-oe-linux/linux-yocto/linux-yocto-3.2.11+git6+867fc7a19f2ea74253d1f20c3d61b7829635175b_4+4ca7e2c5d42e755e1b4c3e1478128f047a8ed2a8-r1/linux-qemux86-64-standard-build
$ ../linux/scripts/setlocalversion ../linux
-yocto-standard+

so if it calls setlocalversion against in ../linux tree we can touch
.scmversion also in that directory instead of ${B}.

Cheers,

> 
> Cheers,
> 
> > 
> > > Acked-by: Bruce Ashfield <bruce.ashfield at windriver.com>
> > > 
> > > >
> > > > Signed-off-by: Martin Jansa<Martin.Jansa at gmail.com>
> > > > ---
> > > >   meta/classes/kernel.bbclass |    6 ++++++
> > > >   1 files changed, 6 insertions(+), 0 deletions(-)
> > > >
> > > > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> > > > index 5e4cdd4..736768e 100644
> > > > --- a/meta/classes/kernel.bbclass
> > > > +++ b/meta/classes/kernel.bbclass
> > > > @@ -204,6 +204,12 @@ sysroot_stage_all_append() {
> > > >   }
> > > >
> > > >   kernel_do_configure() {
> > > > +	# fixes extra + in /lib/modules/2.6.37+
> > > > +	# $ scripts/setlocalversion . =>  +
> > > > +	# $ make kernelversion =>  2.6.37
> > > > +	# $ make kernelrelease =>  2.6.37+
> > > > +	touch ${B}/.scmversion
> > > > +
> > > >   	# Copy defconfig to .config if .config does not exist. This allows
> > > >   	# recipes to manage the .config themselves in do_configure_prepend().
> > > >   	if [ -f "${WORKDIR}/defconfig" ]&&  [ ! -f "${B}/.config" ]; then
> > > 
> > 
> > -- 
> > Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
> 
> 
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com



-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20120326/90430d22/attachment-0002.sig>