34 messages in org.freebsd.freebsd-currentRe: sys/conf/newvers.sh vs. subversio...| From | Sent On | Attachments |
|---|---|---|
| David Wolfskill | Oct 20, 2011 4:48 am | |
| David Wolfskill | Oct 20, 2011 5:20 am |  .diff |
| Steve Kargl | Oct 20, 2011 7:33 am | |
| Michael Butler | Oct 20, 2011 7:43 am | |
| Sergey V. Dyatko | Oct 20, 2011 11:01 pm | |
| Garrett Cooper | Oct 20, 2011 11:49 pm | |
| John Baldwin | Oct 21, 2011 1:35 pm | |
| David Wolfskill | Oct 21, 2011 2:11 pm | |
| Craig Rodrigues | Oct 21, 2011 5:50 pm | |
| Doug Barton | Oct 21, 2011 6:11 pm | |
| Craig Rodrigues | Oct 21, 2011 10:41 pm | |
| Doug Barton | Oct 21, 2011 10:47 pm | |
| Garrett Cooper | Oct 22, 2011 8:29 am | |
| Olivier Smedts | Oct 22, 2011 8:38 am | |
| Nali Toja | Oct 22, 2011 9:04 am | |
| Luchesar V. ILIEV | Oct 22, 2011 9:31 am | |
| Garrett Cooper | Oct 22, 2011 11:02 am | |
| Doug Barton | Oct 22, 2011 11:11 am | |
| Boris Samorodov | Oct 22, 2011 12:06 pm | |
| Doug Barton | Oct 22, 2011 12:12 pm | |
| Garrett Cooper | Oct 22, 2011 12:24 pm | |
| John Baldwin | Oct 24, 2011 4:59 am | |
| Luchesar V. ILIEV | Oct 24, 2011 6:55 am | |
| Craig Rodrigues | Oct 24, 2011 10:14 am | |
| Doug Barton | Oct 24, 2011 2:48 pm | |
| David Wolfskill | Oct 25, 2011 6:59 am | |
| Craig Rodrigues | Oct 25, 2011 12:43 pm | |
| Doug Barton | Oct 25, 2011 1:07 pm | .diff |
| Craig Rodrigues | Oct 25, 2011 1:23 pm | |
| Doug Barton | Oct 25, 2011 1:53 pm | |
| Craig Rodrigues | Oct 25, 2011 2:45 pm | |
| Doug Barton | Oct 25, 2011 4:03 pm | |
| Craig Rodrigues | Oct 27, 2011 12:05 pm | .diff, .txt, .txt |
| Doug Barton | Oct 27, 2011 1:45 pm |
| Subject: | Re: sys/conf/newvers.sh vs. subversion-1.7 | |
|---|---|---|
| From: | David Wolfskill (dav...@catwhisker.org) | |
| Date: | Oct 25, 2011 6:59:37 am | |
| List: | org.freebsd.freebsd-current | |
On Fri, Oct 21, 2011 at 04:36:05PM -0400, John Baldwin wrote:
...
Well, as of subversion-1.7, we don't have a ".svn" directory in ${SYSDIR} any more -- it's only at the root of the working copy (/usr/src, in this case). So "svnversion" is never invoked.
So I've just hacked my copy to parallel the "git" stanza & look for ${SYSDIR}/../.svn, Not sure that's ideal, but there appears to be precedent.... :-}
It might be handy to resolve this prior to 9.0-RELEASE, I think. ...
...
Hmm, that won't always work, the problem is if someone just checks out a kernel tree then .svn will be in SYSDIR. Alternatively, if you have a tree like mine which has work/freebsd/svn/ with various subdirs (head/, stable/ with subdirs for 7, 8, 9) but all rooted at the upperlevel, just looking two levels up won't work.
OK... How about (untested) something like:
Index: sys/conf/newvers.sh =================================================================== --- sys/conf/newvers.sh (revision 226724) +++ sys/conf/newvers.sh (working copy) @@ -88,7 +88,7 @@ i=`${MAKE:-make} -V KERN_IDENT`
for dir in /bin /usr/bin /usr/local/bin; do
- if [ -d "${SYSDIR}/.svn" -a -x "${dir}/svnversion" ] ; then
+ if [ ( -d "${SYSDIR}/.svn" -o -d "${SYSDIR}/../.svn" ) -a -x
"${dir}/svnversion" ] ; then
svnversion=${dir}/svnversion
break
fi
then? That should preserve current behavior for the case you & Jilles expressed concern about, while repairing the currently-broken default case.
I believe it's in the interest of the project to have that default case working again (at least) in time for 9.0-RELEASE.
Please.
....
I'm staying out of the "svnversion vs. svn info" branch of the thread.
Peace, david
-- David H. Wolfskill dav...@catwhisker.org Depriving a girl or boy of an opportunity for education is evil.
See http://www.catwhisker.org/~david/publickey.gpg for my public key.