From owner-svn-src-all@FreeBSD.ORG Tue Jan 22 18:13:49 2013 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 48DF4B3F; Tue, 22 Jan 2013 18:13:49 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (lor.one-eyed-alien.net [69.66.77.232]) by mx1.freebsd.org (Postfix) with ESMTP id 07666A72; Tue, 22 Jan 2013 18:13:47 +0000 (UTC) Received: from lor.one-eyed-alien.net (localhost [127.0.0.1]) by lor.one-eyed-alien.net (8.14.5/8.14.5) with ESMTP id r0MIDmoo001992; Tue, 22 Jan 2013 12:13:48 -0600 (CST) (envelope-from brooks@lor.one-eyed-alien.net) Received: (from brooks@localhost) by lor.one-eyed-alien.net (8.14.5/8.14.5/Submit) id r0MIDmpH001991; Tue, 22 Jan 2013 12:13:48 -0600 (CST) (envelope-from brooks) Date: Tue, 22 Jan 2013 12:13:48 -0600 From: Brooks Davis To: Chris Rees Subject: Re: svn commit: r245752 - in head: etc share/mk Message-ID: <20130122181348.GA1662@lor.one-eyed-alien.net> References: <201301212240.r0LMedcF088022@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="J2SCkAp4GZ/dPZZf" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 18:13:49 -0000 --J2SCkAp4GZ/dPZZf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jan 22, 2013 at 05:55:31PM +0000, Chris Rees wrote: > On 21 January 2013 22:40, Brooks Davis wrote: > > Author: brooks > > Date: Mon Jan 21 22:40:39 2013 > > New Revision: 245752 > > URL: http://svnweb.freebsd.org/changeset/base/245752 > > > > Log: > > Replace all known uses of ln in the build process with appropriate > > install -l invocations via new INSTALL_LINK and INSTALL_SYMLINK > > variables. > > > > Sponsored by: DARPA, AFRL > > Reviewed by: ian, ray, rpaulo > > > > Modified: > > head/etc/Makefile > > head/share/mk/bsd.incs.mk > > head/share/mk/bsd.info.mk > > head/share/mk/bsd.lib.mk > > head/share/mk/bsd.links.mk > > head/share/mk/bsd.man.mk > > head/share/mk/bsd.own.mk > > > > Modified: head/etc/Makefile > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/etc/Makefile Mon Jan 21 22:32:00 2013 (r245751) > > +++ head/etc/Makefile Mon Jan 21 22:40:39 2013 (r245752) > > @@ -324,26 +324,29 @@ distrib-dirs: > > -f $$m -p $$d; \ > > ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $= $d; \ > > done; true > > - ln -sfh usr/src/sys ${DESTDIR}/sys > > + ${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys >=20 > This broke installworld for me, because of the different behaviour. >=20 > ln -sf overwrites existing symlinks, whereas install -l a b puts a > symlink to a inside itself... which fails on a read-only src (NFS > mounted). >=20 > Perhaps it's install misbehaving? I can't work out if it's > bootstrapped properly; we should be using new install(1), are we? Sorry about that. It's fixed. -- Brooks --J2SCkAp4GZ/dPZZf Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iD8DBQFQ/tbcXY6L6fI4GtQRAiFLAKCxbdqoSTJF8dvxyoc5NrCMlnqtGQCeMxCO nGEQ58sX2BfUUQ0ST9rgBtk= =vDFI -----END PGP SIGNATURE----- --J2SCkAp4GZ/dPZZf--