From owner-svn-src-head@freebsd.org Sun Mar 5 15:11:48 2017 Return-Path: Delivered-To: svn-src-head@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 53356CF92A3; Sun, 5 Mar 2017 15:11:48 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 21D7F1566; Sun, 5 Mar 2017 15:11:47 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from Julian-MBP3.local (106-68-109-205.dyn.iinet.net.au [106.68.109.205]) (authenticated bits=0) by vps1.elischer.org (8.15.2/8.15.2) with ESMTPSA id v25FBf6X043253 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sun, 5 Mar 2017 07:11:44 -0800 (PST) (envelope-from julian@freebsd.org) Subject: Re: svn commit: r314693 - head/usr.sbin/rmt To: rgrimes@freebsd.org, Baptiste Daroussin References: <201703051319.v25DJSGt082916@pdx.rh.CN85.dnsmgr.net> Cc: svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Julian Elischer Message-ID: <761e6ecf-89aa-6356-4650-08f3c5c9d6a8@freebsd.org> Date: Sun, 5 Mar 2017 23:11:35 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <201703051319.v25DJSGt082916@pdx.rh.CN85.dnsmgr.net> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Mar 2017 15:11:48 -0000 On 5/3/17 9:19 pm, Rodney W. Grimes wrote: > -- 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. I've been playing around with libpathconv which converts abs paths to relative paths etc. I'w working on the patch to ln to add the -a and -r options that some other versions have. you can specify an absolute path but ln -r (abspath) will generate a relative link. my target was the exact absolute symlinks that you are targeting. Work commitments have made me lay down tools but this reminds me to pick it up again. (libpathconv is in the tree at /lib/libpathconv, but I got interrupted half way through.. I'll do the other half.. >> 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! >