2009-03-30 12:21:50

by Nico Schottelius

[permalink] [raw]
Subject: [PATCH] Fix scripts/setlocalversion with git

Hello!

When using trees like wireless-testing, which have untagged tags,
scripts/setlocalversion does not display any git indication for
localversion.

This patch fixes it: If git is available, but no usable tag is found,
it uses -g${head}. It skips the detection of unanottated tags via
git name-rev.

Please apply, otherwise testers like me always have '2.6.29' for trees
with unanottated tags, instead of 2.6.29-20318-g9aa4755, which helps
a lot if you've tons of kernels installed from different trees.

Sincerly,

Nico

ps: please cc on reply


Attachments:
(No filename) (0.00 B)
signature.asc (197.00 B)
Digital signature
Download all attachments

2009-04-07 15:44:56

by Nico Schottelius

[permalink] [raw]
Subject: [Resend] [PATCH] Fix scripts/setlocalversion with git

Hello again!

I just saw that this patch did not go anywhere and did not have
any replies, so I repost it.

I also created a git-repo at

git://git.schottelius.org/linux/linux-2.6
gitweb:
http://git.schottelius.org/?p=linux/linux-2.6;a=summary

if you want the patch (f43ba0be1204e7c26cc700a75bdb688a788fbf2f)
via git.

Sincerly,

Nico

Nico Schottelius [Mon, Mar 30, 2009 at 02:21:37PM +0200]:
> Hello!
>
> When using trees like wireless-testing, which have untagged tags,
> scripts/setlocalversion does not display any git indication for
> localversion.
>
> This patch fixes it: If git is available, but no usable tag is found,
> it uses -g${head}. It skips the detection of unanottated tags via
> git name-rev.
>
> Please apply, otherwise testers like me always have '2.6.29' for trees
> with unanottated tags, instead of 2.6.29-20318-g9aa4755, which helps
> a lot if you've tons of kernels installed from different trees.
>
> Sincerly,
>
> Nico
>
> ps: please cc on reply


Attachments:
(No filename) (0.00 B)
signature.asc (197.00 B)
Digital signature
Download all attachments

2009-04-07 15:56:51

by Jiri Kosina

[permalink] [raw]
Subject: Re: [Resend] [PATCH] Fix scripts/setlocalversion with git

On Tue, 7 Apr 2009, Nico Schottelius wrote:

> Hello again!
>
> I just saw that this patch did not go anywhere and did not have
> any replies, so I repost it.
>
> I also created a git-repo at
>
> git://git.schottelius.org/linux/linux-2.6
> gitweb:
> http://git.schottelius.org/?p=linux/linux-2.6;a=summary
>
> if you want the patch (f43ba0be1204e7c26cc700a75bdb688a788fbf2f)
> via git.
>
> Sincerly,
>
> Nico
>
> Nico Schottelius [Mon, Mar 30, 2009 at 02:21:37PM +0200]:
> > Hello!
> >
> > When using trees like wireless-testing, which have untagged tags,
> > scripts/setlocalversion does not display any git indication for
> > localversion.
> >
> > This patch fixes it: If git is available, but no usable tag is found,
> > it uses -g${head}. It skips the detection of unanottated tags via
> > git name-rev.
> >
> > Please apply, otherwise testers like me always have '2.6.29' for trees
> > with unanottated tags, instead of 2.6.29-20318-g9aa4755, which helps
> > a lot if you've tons of kernels installed from different trees.

This patch isn't trivial enough to be applicable through trivial tree.
Adding Sam to CC.

--
Jiri Kosina
SUSE Labs

2009-04-07 17:43:56

by Sam Ravnborg

[permalink] [raw]
Subject: Re: [Resend] [PATCH] Fix scripts/setlocalversion with git

On Tue, Apr 07, 2009 at 05:56:31PM +0200, Jiri Kosina wrote:
> On Tue, 7 Apr 2009, Nico Schottelius wrote:
>
> > Hello again!
> >
> > I just saw that this patch did not go anywhere and did not have
> > any replies, so I repost it.
> >
> > I also created a git-repo at
> >
> > git://git.schottelius.org/linux/linux-2.6
> > gitweb:
> > http://git.schottelius.org/?p=linux/linux-2.6;a=summary
> >
> > if you want the patch (f43ba0be1204e7c26cc700a75bdb688a788fbf2f)
> > via git.
> >
> > Sincerly,
> >
> > Nico
> >
> > Nico Schottelius [Mon, Mar 30, 2009 at 02:21:37PM +0200]:
> > > Hello!
> > >
> > > When using trees like wireless-testing, which have untagged tags,
> > > scripts/setlocalversion does not display any git indication for
> > > localversion.
> > >
> > > This patch fixes it: If git is available, but no usable tag is found,
> > > it uses -g${head}. It skips the detection of unanottated tags via
> > > git name-rev.
> > >
> > > Please apply, otherwise testers like me always have '2.6.29' for trees
> > > with unanottated tags, instead of 2.6.29-20318-g9aa4755, which helps
> > > a lot if you've tons of kernels installed from different trees.
>
> This patch isn't trivial enough to be applicable through trivial tree.
> Adding Sam to CC.

Thanks. Will take care later this week.

Sam

2009-04-17 21:34:50

by Nico Schottelius

[permalink] [raw]
Subject: Re: [Resend] [PATCH] Fix scripts/setlocalversion with git

Hey Sam,

Sam Ravnborg [Tue, Apr 07, 2009 at 07:45:50PM +0200]:
> On Tue, Apr 07, 2009 at 05:56:31PM +0200, Jiri Kosina wrote:
> > On Tue, 7 Apr 2009, Nico Schottelius wrote:
> >
> > > git://git.schottelius.org/linux/linux-2.6
> > >
> > > if you want the patch (f43ba0be1204e7c26cc700a75bdb688a788fbf2f)
> > > via git.
> >
> > This patch isn't trivial enough to be applicable through trivial tree.
> > Adding Sam to CC.
>
> Thanks. Will take care later this week.

had some time to look at it / some comments?

Sincerly,

Nico

--
Think about Free and Open Source Software (FOSS).
http://nico.schottelius.org/documentations/foss/the-term-foss/

PGP: BFE4 C736 ABE5 406F 8F42 F7CF B8BE F92A 9885 188C


Attachments:
(No filename) (709.00 B)
signature.asc (197.00 B)
Digital signature
Download all attachments

2009-04-17 21:56:16

by Sam Ravnborg

[permalink] [raw]
Subject: Re: [Resend] [PATCH] Fix scripts/setlocalversion with git

On Fri, Apr 17, 2009 at 11:34:36PM +0200, Nico Schottelius wrote:
> Hey Sam,
>
> Sam Ravnborg [Tue, Apr 07, 2009 at 07:45:50PM +0200]:
> > On Tue, Apr 07, 2009 at 05:56:31PM +0200, Jiri Kosina wrote:
> > > On Tue, 7 Apr 2009, Nico Schottelius wrote:
> > >
> > > > git://git.schottelius.org/linux/linux-2.6
> > > >
> > > > if you want the patch (f43ba0be1204e7c26cc700a75bdb688a788fbf2f)
> > > > via git.
> > >
> > > This patch isn't trivial enough to be applicable through trivial tree.
> > > Adding Sam to CC.
> >
> > Thanks. Will take care later this week.
>
> had some time to look at it / some comments?

I thought I already applied a similar fix.
Care to resend.

Thanks,
Sam

2009-04-18 09:17:18

by Nico Schottelius

[permalink] [raw]
Subject: Re: [Resend] [PATCH] Fix scripts/setlocalversion with git

Sam Ravnborg [Fri, Apr 17, 2009 at 11:58:02PM +0200]:
> I thought I already applied a similar fix.
> Care to resend.

- git: git://git.schottelius.org/foreign/linux-2.6 (URL changed!):
f43ba0be1204e7c26cc700a75bdb688a788fbf2fcommit
- Original patch attached (p1)
- Diff against your tree attached (p2)

Nico

--
Think about Free and Open Source Software (FOSS).
http://nico.schottelius.org/documentations/foss/the-term-foss/

PGP: BFE4 C736 ABE5 406F 8F42 F7CF B8BE F92A 9885 188C


Attachments:
(No filename) (0.00 B)
signature.asc (197.00 B)
Digital signature
Download all attachments

2009-04-25 07:48:25

by Sam Ravnborg

[permalink] [raw]
Subject: Re: [Resend] [PATCH] Fix scripts/setlocalversion with git

On Sat, Apr 18, 2009 at 11:16:53AM +0200, Nico Schottelius wrote:
> Sam Ravnborg [Fri, Apr 17, 2009 at 11:58:02PM +0200]:
> > I thought I already applied a similar fix.
> > Care to resend.
>
> - git: git://git.schottelius.org/foreign/linux-2.6 (URL changed!):
> f43ba0be1204e7c26cc700a75bdb688a788fbf2fcommit
> - Original patch attached (p1)
> - Diff against your tree attached (p2)
>
> Nico

Applied p2 - had to do so manually.

Sam

2009-04-25 12:25:19

by Nico Schottelius

[permalink] [raw]
Subject: Re: [Resend] [PATCH] Fix scripts/setlocalversion with git

Sam Ravnborg [Sat, Apr 25, 2009 at 09:50:19AM +0200]:
> On Sat, Apr 18, 2009 at 11:16:53AM +0200, Nico Schottelius wrote:
> > Sam Ravnborg [Fri, Apr 17, 2009 at 11:58:02PM +0200]:
> > - Diff against your tree attached (p2)
>
> Applied p2 - had to do so manually.

Thanks! This makes life much easier for testers like me :-)

Enjod the sunny saturday!

Nico

--
Think about Free and Open Source Software (FOSS).
http://nico.schottelius.org/documentations/foss/the-term-foss/

PGP: BFE4 C736 ABE5 406F 8F42 F7CF B8BE F92A 9885 188C


Attachments:
(No filename) (533.00 B)
signature.asc (197.00 B)
Digital signature
Download all attachments