From owner-svn-src-all@freebsd.org Sun Mar 5 13:19:31 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC337CF9103; Sun, 5 Mar 2017 13:19:31 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 222C316DC; Sun, 5 Mar 2017 13:19:31 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v25DJSkt082917; Sun, 5 Mar 2017 05:19:29 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v25DJSGt082916; Sun, 5 Mar 2017 05:19:28 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201703051319.v25DJSGt082916@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r314693 - head/usr.sbin/rmt In-Reply-To: <20170305101517.abhgspc47mrdbdwb@ivaldir.net> To: Baptiste Daroussin Date: Sun, 5 Mar 2017 05:19:28 -0800 (PST) CC: "Rodney W. Grimes" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Sun, 05 Mar 2017 13:19:32 -0000 -- Start of PGP signed section. > On Sun, Mar 05, 2017 at 04:09:18AM +0000, Rodney W. Grimes wrote: > > Author: rgrimes > > Date: Sun Mar 5 04:09:18 2017 > > New Revision: 314693 > > URL: https://svnweb.freebsd.org/changeset/base/314693 > > > > Log: > > Change /etc/rmt symlink from absolute to relative path, > > correcting the mistake made in r6499 > > > > Approved by: grehan > > MFC after: 1 week > > > > Modified: > > head/usr.sbin/rmt/Makefile > > > > Modified: head/usr.sbin/rmt/Makefile > > ============================================================================== > > --- head/usr.sbin/rmt/Makefile Sun Mar 5 04:02:47 2017 (r314692) > > +++ head/usr.sbin/rmt/Makefile Sun Mar 5 04:09:18 2017 (r314693) > > @@ -7,6 +7,6 @@ MAN= rmt.8 > > # called from /usr/src/etc/Makefile > > etc-rmt: > > rm -f ${DESTDIR}/etc/rmt > > - ln -s ${BINDIR}/rmt ${DESTDIR}/etc/rmt > > + ln -s ..${BINDIR}/rmt ${DESTDIR}/etc/rmt > > I think this should be ${INSTALL_RSYMLINK} ${BINDIR}/rmt ${DESTDIR}/etc/rmt find /usr/src | xargs grep INSTALL_RSYM (no results) Sorry, no prior work does this, perhaps once I get done sweeping the absolutes out of the tree (about 10 or 15 IIRC) a pass can be made to sweep all ln -s out and propage this internal bsd.lib.mk function out to the rest of the source tree? find /usr/share/mk/ | xargs grep INSTALL_RSYM /usr/share/mk/bsd.own.mk:INSTALL_RSYMLINK?= ${INSTALL} ${RSYMLINK} /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ This is called from within bsd.lib.mk only, do we want to use this for all symbolics links in the source tree? If so I would of though the person adding this functionality to the .mk files would of made a tree sweeping looking for that and making those changes as well. > The rm -f before can then be removed, the symlink will be relative and the > METALOG will be respected METALOG? The only documentation I can find on this seems to be part of src/tootls/tools/makeroot.8. It appears that something in Makefile.inc uses it and there are references to it in etc/Makefile. Where is this METALOG documented? > Best regards, > Bapt -- End of PGP section, PGP failed! -- Rod Grimes rgrimes@freebsd.org