Date: Fri, 6 Jan 2012 21:35:31 +0300 From: Sergey Kandaurov <pluknet@gmail.com> To: Oliver Pinter <pinter@tresorium.hu> Cc: stable@freebsd.org, current@freebsd.org Subject: Re: [RFC] fix git detection code in newvers.sh when svn installed Message-ID: <CAE-mSOKaUZ-RJpaYVbQDvXp9dM9o7grbDL6U-TJ8jLBK9K%2BuQQ@mail.gmail.com> In-Reply-To: <201201061850.33863.pinter@tresorium.hu> References: <201201061850.33863.pinter@tresorium.hu>
next in thread | previous in thread | raw e-mail | index | archive | help
On 6 January 2012 21:50, Oliver Pinter <pinter@tresorium.hu> wrote:
> Hi All!
>
> When svn installed and the source stored in git, then now the version
> detection failed. The attached patch fixed this situation.
>
FWIW, a different version proposed by Maciej Milewski on -current
some time ago. I don't have/use git, so I cannot test these changes.
It is good in the sense that it doesn't duplicate a search path.
The patch is below for reference:
--- sys/conf/newvers.sh 2011-11-19 00:56:50.795815738 +0100
+++ sys/conf/newvers-patched.sh 2011-11-19 00:58:21.187818982 +0100
@@ -88,14 +88,14 @@
i=`${MAKE:-make} -V KERN_IDENT`
for dir in /bin /usr/bin /usr/local/bin; do
- if [ -x "${dir}/svnversion" ] ; then
- svnversion=${dir}/svnversion
- break
- fi
if [ -d "${SYSDIR}/../.git" -a -x "${dir}/git" ] ; then
git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git"
break
fi
+ if [ -x "${dir}/svnversion" ] ; then
+ svnversion=${dir}/svnversion
+ break
+ fi
done
if [ -n "$svnversion" ] ; then
--
wbr,
pluknet
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAE-mSOKaUZ-RJpaYVbQDvXp9dM9o7grbDL6U-TJ8jLBK9K%2BuQQ>