* Kernel version has extra '+' when kernel is built from git
[not found] <20111212084206.608CB10332@opal>
@ 2011-12-12 8:47 ` Martin Jansa
2011-12-12 8:53 ` Koen Kooi
0 siblings, 1 reply; 4+ messages in thread
From: Martin Jansa @ 2011-12-12 8:47 UTC (permalink / raw)
To: openembedded-devel; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
On Mon, Dec 12, 2011 at 08:42:06AM +0000, git@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@dominion.thruhere.net>
> Date: Sun Dec 11 09:46:28 2011 +0100
>
> kernel bbclass: sync with OE-core
>
> Signed-off-by: Koen Kooi <koen@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
}
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..
>
> ---
>
> meta-oe/classes/kernel.bbclass | 105 +++++++++++++++++++++++-----------------
> 1 files changed, 61 insertions(+), 44 deletions(-)
>
> Diff: http://git.openembedded.org/?p=meta-openembedded.git/?a=commitdiff;h=c486dfa4013b37972c1a1e4df8616eb6f49de498
>
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Kernel version has extra '+' when kernel is built from git
2011-12-12 8:47 ` Kernel version has extra '+' when kernel is built from git Martin Jansa
@ 2011-12-12 8:53 ` Koen Kooi
2011-12-12 8:58 ` Martin Jansa
0 siblings, 1 reply; 4+ messages in thread
From: Koen Kooi @ 2011-12-12 8:53 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1581 bytes --]
Op 12 dec. 2011, om 09:47 heeft Martin Jansa het volgende geschreven:
> On Mon, Dec 12, 2011 at 08:42:06AM +0000, git@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@dominion.thruhere.net>
>> Date: Sun Dec 11 09:46:28 2011 +0100
>>
>> kernel bbclass: sync with OE-core
>>
>> Signed-off-by: Koen Kooi <koen@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@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.
regards,
Koen
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 169 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Kernel version has extra '+' when kernel is built from git
2011-12-12 8:53 ` Koen Kooi
@ 2011-12-12 8:58 ` Martin Jansa
2011-12-12 15:30 ` Bruce Ashfield
0 siblings, 1 reply; 4+ messages in thread
From: Martin Jansa @ 2011-12-12 8:58 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2069 bytes --]
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@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@dominion.thruhere.net>
> >> Date: Sun Dec 11 09:46:28 2011 +0100
> >>
> >> kernel bbclass: sync with OE-core
> >>
> >> Signed-off-by: Koen Kooi <koen@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@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.
Regards,
>
> regards,
>
> Koen
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Kernel version has extra '+' when kernel is built from git
2011-12-12 8:58 ` Martin Jansa
@ 2011-12-12 15:30 ` Bruce Ashfield
0 siblings, 0 replies; 4+ messages in thread
From: Bruce Ashfield @ 2011-12-12 15:30 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: openembedded-devel
On Mon, Dec 12, 2011 at 3:58 AM, Martin Jansa <martin.jansa@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@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@dominion.thruhere.net>
>> >> Date: Sun Dec 11 09:46:28 2011 +0100
>> >>
>> >> kernel bbclass: sync with OE-core
>> >>
>> >> Signed-off-by: Koen Kooi <koen@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@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@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@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"
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-12-12 15:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20111212084206.608CB10332@opal>
2011-12-12 8:47 ` Kernel version has extra '+' when kernel is built from git Martin Jansa
2011-12-12 8:53 ` Koen Kooi
2011-12-12 8:58 ` Martin Jansa
2011-12-12 15:30 ` Bruce Ashfield
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox