[OE-core] Kernel version has extra '+' when kernel is built from git

[Bruce Ashfield]

On Mon, Dec 12, 2011 at 3:58 AM, Martin Jansa <martin.jansa at gmail.com> wrote:
> On Mon, Dec 12, 2011 at 09:53:47AM +0100, Koen Kooi wrote:
>>
>> Op 12 dec. 2011, om 09:47 heeft Martin Jansa het volgende geschreven:
>>
>> > On Mon, Dec 12, 2011 at 08:42:06AM +0000, git at git.openembedded.org wrote:
>> >> Module: meta-openembedded.git
>> >> Branch: master
>> >> Commit: c486dfa4013b37972c1a1e4df8616eb6f49de498
>> >> URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=c486dfa4013b37972c1a1e4df8616eb6f49de498
>> >>
>> >> Author: Koen Kooi <koen at dominion.thruhere.net>
>> >> Date:   Sun Dec 11 09:46:28 2011 +0100
>> >>
>> >> kernel bbclass: sync with OE-core
>> >>
>> >> Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
>> >
>> > If you're working on shared linux.inc in meta-oe, could you please
>> > integrate this:
>> >
>> > do_configure_prepend() {
>> > #otherwise it gets extra '+' "2.6.37+"
>> > #because:
>> > #$ scripts/setlocalversion . => +
>> > #$ make kernelversion => 2.6.37
>> > #$ make kernelrelease => 2.6.37+
>> >  rm -rf ${S}/.git
>> > }
>>
>> That would break the following:
>>
>> koen at dominion:/OE/tentacle$ tail conf/local.conf -n15 | head -n4
>> ASSUME_PROVIDED += "gitam-native"
>> PATCHTOOL_pn-linux-ti33x-psp = "gitam"
>> PATCHTOOL_pn-linux = "gitam"
>> PATCHTOOL_pn-u-boot = "gitam"
>>
>>
>> > I have to do this in every git recipe as I don't like dirs like
>> > /lib/modules/2.6.37+
>>
>>
>> > Maybe it should be fixed on kernel.bbclass level, because linux-yocto
>> > suffers the same ie /lib/modules/3.0.12-yocto-standard+
>> >
>> > Ccing oe-core for that..
>>
>>
>> I had a patch for scripts/setlocalversion that got rid of the '+', but I stopped caring after a while. We could just run sed in kernel.bbclass to fix the script.
>
> Even better than removing .git.

Agreed. We definitely do not want to remove git, that would break anyone doing
git based patching (as Koen) pointed out.

Either carrying a patch to fix the in kernel script, or fixing it up
after the configure
phase work for me.

Cheers,

Bruce

>
> Regards,
>
>>
>> regards,
>>
>> Koen
>
>
>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core at lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"