Kernel version has extra '+' when kernel is built from git

DISCUSSION Martin Jansa 3 participants 4 messages Dec 12, 2011 1 message not in the archive

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): 20111212084206.608CB10332@opal

Martin Jansa

author

2011-12-12 08:54 UTC #1 lore raw

Quoted 11 lines · On Mon, Dec 12, 2011 at 08:42:06AM +0000, [email protected] 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 <[email protected]>
Date:   Sun Dec 11 09:46:28 2011 +0100

kernel bbclass: sync with OE-core

Signed-off-by Koen Kooi <[email protected]>

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..

Quoted 12 lines

---
 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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Koen Kooi

2011-12-12 09:00 UTC #2 lore raw

Op 12 dec. 2011, om 09:47 heeft Martin Jansa het volgende geschreven:

Quoted 16 lines · On Mon, Dec 12, 2011 at 08:42:06AM +0000, [email protected] wrote:

Quoted 11 lines
Module: meta-openembedded.git
Branch: master
Commit: c486dfa4013b37972c1a1e4df8616eb6f49de498
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=c486dfa4013b37972c1a1e4df8616eb6f49de498
Author: Koen Kooi <[email protected]>
Date:   Sun Dec 11 09:46:28 2011 +0100
kernel bbclass: sync with OE-core
Signed-off-by Koen Kooi <[email protected]>
If you're working on shared linux.inc in meta-oe, could you please integrate this:

Quoted 8 lines

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"

Quoted 8 lines

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

Martin Jansa

author

2011-12-12 09:05 UTC #3 lore raw

Quoted 41 lines · Koen Kooi

Op 12 dec. 2011, om 09:47 heeft Martin Jansa het volgende geschreven:
Quoted 16 lines · On Mon, Dec 12, 2011 at 08:42:06AM +0000, [email protected] wrote:
Quoted 11 lines
Module: meta-openembedded.git
Branch: master
Commit: c486dfa4013b37972c1a1e4df8616eb6f49de498
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=c486dfa4013b37972c1a1e4df8616eb6f49de498
Author: Koen Kooi <[email protected]>
Date:   Sun Dec 11 09:46:28 2011 +0100
kernel bbclass: sync with OE-core
Signed-off-by Koen Kooi <[email protected]>
If you're working on shared linux.inc in meta-oe, could you please integrate this:
Quoted 8 lines
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"
Quoted 2 lines
I have to do this in every git recipe as I don't like dirs like /lib/modules/2.6.37+

Quoted 7 lines

Quoted 4 lines
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,

Quoted 11 lines

regards,
Koen
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Bruce Ashfield

2011-12-12 15:37 UTC #4 lore raw

Quoted 45 lines · Martin Jansa

Quoted 44 lines · Koen Kooi
Op 12 dec. 2011, om 09:47 heeft Martin Jansa het volgende geschreven:
Quoted 16 lines · On Mon, Dec 12, 2011 at 08:42:06AM +0000, [email protected] wrote:
Quoted 11 lines
Module: meta-openembedded.git
Branch: master
Commit: c486dfa4013b37972c1a1e4df8616eb6f49de498
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=c486dfa4013b37972c1a1e4df8616eb6f49de498
Author: Koen Kooi <[email protected]>
Date: Sun Dec 11 09:46:28 2011 +0100
kernel bbclass: sync with OE-core
Signed-off-by Koen Kooi <[email protected]>
If you're working on shared linux.inc in meta-oe, could you please integrate this:
Quoted 8 lines
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"
Quoted 7 lines
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+

Quoted 6 lines

Quoted 4 lines
Quoted 1 line
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

Quoted 24 lines

Regards,
Quoted 11 lines
regards,
Koen
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: [email protected]
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 2 lines

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