Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Dec 2011 07:35:27 -0600
From:      Chuck Burns <break19@gmail.com>
To:        freebsd-current@freebsd.org
Subject:   Re: How to update /usr/src/ using SVN and "make update"?
Message-ID:  <201112100735.27683.break19@gmail.com>
In-Reply-To: <4EE32D8D.2080308@zedat.fu-berlin.de>
References:  <4EE32D8D.2080308@zedat.fu-berlin.de>

next in thread | previous in thread | raw e-mail | index | archive | help
--Boundary-00=_fA24Okh8RQVWStY
Content-Type: Text/Plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 7bit

On Saturday, December 10, 2011 3:59:41 AM O. Hartmann wrote:
> Taking the instruction from manpage make.conf(5) and setting  variable
> SVN_UPDATE to YES, typing "make update" in /usr/src	 fails due to svn
> can not be found. make.conf(5) also contains a variable "SUP" containing
> the path for cvsup or cvsup and I'm desperately missing a similar
> variable for subversion. Since subversion is a port, it might be so that
> setting a variable in make.conf(5) conflicts with the BSD policy and
> logic, but then I'd appreciate a hint like "you need to set the propper
> environment variable for finding svn in the search path ...blablabla".
> Using "make update" ends up in "svn not found". Typing manually "svn -r
> HEAD" in /usr/src as it is shown when the make update fails works well,
> since the shell's environment PATH variable knows /usr/local/bin to look
> for.
> I also file a PR not letting this getting forgotten, please close it, if
> it is obsolete.
> 
> Regards,
> O. Hartmann

Here is quick, hackish patch to allow your make update to work, it appears 
that the Makefile.inc1 does not include the full path to svn, while it does 
include the full path to cvs and other tools, this makes me think that the 
user path is ignored (which is a good thing)

 --
Chuck Burns
The Southern Libertarian
http://www.thesouthernlibertarian.com/

--Boundary-00=_fA24Okh8RQVWStY
Content-Type: text/x-patch; charset="ISO-8859-1"; name="Makefile.inc1.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="Makefile.inc1.patch"

Index: Makefile.inc1
===================================================================
--- Makefile.inc1       (revision 228349)
+++ Makefile.inc1       (working copy)
@@ -106,7 +106,7 @@
 
 CVS?=          cvs
 CVSFLAGS?=     -A -P -d -I!
-SVN?=          svn
+SVN?=          /usr/local/bin/svn
 SVNFLAGS?=     -r HEAD
 SUP?=          /usr/bin/csup
 SUPFLAGS?=     -g -L 2


--Boundary-00=_fA24Okh8RQVWStY--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112100735.27683.break19>