| Message ID | 87zjrt3q34.fsf@dell.be.48ers.dk |
|---|---|
| State | Not Applicable |
| Headers | show |
>>>>> "Ruud" == Ruud Commandeur <RCommandeur@clb.nl> writes:
Peter> Ok, I'm afraid there's not much to do about svn being crap :/
Peter> How come you are only seeing this now? We've been calling
Peter> setlocalversion since 2010. Did you recently upgrade your svn version?
Peter> Looking at the kernel history (where setlocalversion comes from), I see
Peter> a commit from Mike Frysinger where the svn status step is skipped as it
Peter> was deemed too slow, so perhaps we should just resync our
Peter> setlocalversion script with the kernel:
Peter> I'll do that now.
It is now in git. Could you give it a test please?
Hi Peter, I'm only seeing this now, because I installed the subversion package yesterday. The project has been under svn control from the beginning with SmartSvn, which has it's own svn built-in. But now the setlocalversion script can finally do it's intended job. The change from Mike Frysinger will certainly solve this problem, since the "svn status" part is skipped. Regards, Ruud > -----Oorspronkelijk bericht----- > Van: Peter Korsgaard [mailto:jacmet@gmail.com] Namens Peter Korsgaard > Verzonden: woensdag 4 september 2013 11:15 > Aan: Ruud Commandeur > CC: Thomas Petazzoni; Arnout Vandecappelle; Peter Korsgaard; > buildroot@uclibc.org > Onderwerp: Re: SVN process started at make > > >>>>> "Ruud" == Ruud Commandeur <RCommandeur@clb.nl> writes: > > Ruud> Dear Thomas, > Ruud> Well, I did take a quick look at this file, but could > have seen this > Ruud> myself indeed :-) > > Ruud> So it runs an "svn info" and "svn status". This last > command can take > Ruud> quite some time for a large repository, so this > explains the delay. > > Ok, I'm afraid there's not much to do about svn being crap :/ > > How come you are only seeing this now? We've been calling > setlocalversion since 2010. Did you recently upgrade your svn version? > > Looking at the kernel history (where setlocalversion comes > from), I see > a commit from Mike Frysinger where the svn status step is > skipped as it > was deemed too slow, so perhaps we should just resync our > setlocalversion script with the kernel: > > Author: Mike Frysinger <vapier.adi@gmail.com> > Date: Thu Feb 5 16:13:32 2009 +0800 > > kbuild,setlocalversion: shorten the make time when using svn > > Don't bother doing `svn st` as it takes a retarded amount > of time when > the source is cold > > Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> > Signed-off-by: Bryan Wu <cooloney@kernel.org> > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > > diff --git a/scripts/setlocalversion b/scripts/setlocalversion > index f6946cf..f1c4b35 100755 > --- a/scripts/setlocalversion > +++ b/scripts/setlocalversion > @@ -58,14 +58,7 @@ fi > # Check for svn and a svn repo. > if rev=`svn info 2>/dev/null | grep '^Last Changed Rev'`; then > rev=`echo $rev | awk '{print $NF}'` > - changes=`svn status 2>/dev/null | grep '^[AMD]' | wc -l` > - > - # Are there uncommitted changes? > - if [ $changes != 0 ]; then > - printf -- '-svn%s%s' "$rev" -dirty > - else > - printf -- '-svn%s' "$rev" > - fi > + printf -- '-svn%s' "$rev" > > # All done with svn > exit > > I'll do that now. > > -- > Bye, Peter Korsgaard >
Hi Peter, I did upgrade the setlocalversion from http://git.buildroot.net/buildroot/tree/support/scripts Tested: user@ubuntu-ruud:~/1122-ipcan/buildroot$ make print-version 2013.02-svn84 user@ubuntu-ruud:~/1122-ipcan/buildroot$ So the result is OK as might be expected, with a normal delay between the 1st and 3rd line. Thanks, Ruud > -----Oorspronkelijk bericht----- > Van: Peter Korsgaard [mailto:jacmet@gmail.com] Namens Peter Korsgaard > Verzonden: woensdag 4 september 2013 12:03 > Aan: Ruud Commandeur > CC: Thomas Petazzoni; Arnout Vandecappelle; buildroot@uclibc.org > Onderwerp: Re: SVN process started at make > > >>>>> "Ruud" == Ruud Commandeur <RCommandeur@clb.nl> writes: > > Peter> Ok, I'm afraid there's not much to do about svn being crap :/ > > Peter> How come you are only seeing this now? We've been calling > Peter> setlocalversion since 2010. Did you recently upgrade > your svn version? > > Peter> Looking at the kernel history (where setlocalversion > comes from), I see > Peter> a commit from Mike Frysinger where the svn status > step is skipped as it > Peter> was deemed too slow, so perhaps we should just resync our > Peter> setlocalversion script with the kernel: > > Peter> I'll do that now. > > It is now in git. Could you give it a test please? > > -- > Bye, Peter Korsgaard >
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index f6946cf..f1c4b35 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -58,14 +58,7 @@ fi # Check for svn and a svn repo. if rev=`svn info 2>/dev/null | grep '^Last Changed Rev'`; then rev=`echo $rev | awk '{print $NF}'` - changes=`svn status 2>/dev/null | grep '^[AMD]' | wc -l` - - # Are there uncommitted changes? - if [ $changes != 0 ]; then - printf -- '-svn%s%s' "$rev" -dirty - else - printf -- '-svn%s' "$rev" - fi + printf -- '-svn%s' "$rev" # All done with svn exit