Date: Sun, 5 Mar 2017 14:42:26 +0100 From: Baptiste Daroussin <bapt@freebsd.org> To: rgrimes@freebsd.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314693 - head/usr.sbin/rmt Message-ID: <20170305134226.px4ivdtjjppbgiyf@ivaldir.net> In-Reply-To: <201703051319.v25DJSGt082916@pdx.rh.CN85.dnsmgr.net> References: <20170305101517.abhgspc47mrdbdwb@ivaldir.net> <201703051319.v25DJSGt082916@pdx.rh.CN85.dnsmgr.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--rtnlwvdgxtcumpss Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Mar 05, 2017 at 05:19:28AM -0800, 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 > > >=20 > > > Log: > > > Change /etc/rmt symlink from absolute to relative path, > > > correcting the mistake made in r6499 > > > =20 > > > Approved by: grehan > > > MFC after: 1 week > > >=20 > > > Modified: > > > head/usr.sbin/rmt/Makefile > > >=20 > > > Modified: head/usr.sbin/rmt/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/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=3D 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 > >=20 > > I think this should be ${INSTALL_RSYMLINK} ${BINDIR}/rmt ${DESTDIR}/etc= /rmt >=20 > find /usr/src | xargs grep INSTALL_RSYM > (no results) >=20 > 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? There is also no Makefiles that do ls -sf directly beside that one. INSTALL_RSYMLINK has exactly be done to be use everywhere it is needed. (I = wrote it for that exact reason :)) >=20 > find /usr/share/mk/ | xargs grep INSTALL_RSYM > /usr/share/mk/bsd.own.mk:INSTALL_RSYMLINK?=3D ${INSTALL} ${RSYMLINK} > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS:D${TAG_ARG= S},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_ARG= S},development} ${DESTDIR}${_SHLIBDIR}/${SHLIB_NAME} \ > /usr/share/mk/bsd.lib.mk: ${INSTALL_RSYMLINK} ${TAG_ARGS} ${DESTDIR= }${_SHLIBDIR}/${SHLIB_NAME} \ >=20 > 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. When I did it only bsd.lib.mk was using it iirc >=20 > > The rm -f before can then be removed, the symlink will be relative and = the > > METALOG will be respected=20 >=20 > METALOG? The only documentation I can find on this seems to be part of > src/tootls/tools/makeroot.8. >=20 > It appears that something in Makefile.inc uses it and there are references > to it in etc/Makefile. >=20 > Where is this METALOG documented? =20 It is really badly documented and should be :( it is a mtree file that is generated when built is done via -DNO_ROOT for the purpose of being able to generate disk with makefs as a user I have reused it for packaging base. This was designed IIRC by adrian and brooks iirc. Embedded people relies a lot on it. Everything not going though the install(1) command is not tracked that is w= hy this is an issue. Best regards, Bapt --rtnlwvdgxtcumpss Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgOTj3suS2urGXVU3Y4mL3PG3PloFAli8Fb4ACgkQY4mL3PG3 PlovAg/+INkPWSrdYXoGOdJYa656PoAyL0B8KCGQXIzG6HUFbu9DDcBAsNT9DhQ6 0m5vOY1YrUbCwYpp1Sm2XYyC4viugSjxYRqTGH+pQwXysnT0pdcm/zjIsW3/M15R mKMPgGWjX2ZBv6m60JBgqXGxT9J3/E6dRfCn3xKUMN8cvgs51ZkFW1drJlZkH5OD ZXepw2792z3XqJ+dlIlfzSDUDEYbrawwY75gjLPersNactnvYMZVwcAoB9EvRLiA UIk04piNT1hLwz+yaXBERTSAYXSJvlIm5wX7c1lTJsiYzKNR1AzwH/eUZT9FwqWT WJfICUih07AvKuvDyal3NcCJzesM2kUOeGMMBmR2odY2UrdjERklKT3B28EmeLNk OhrkLQGmBI7/tWQQDsGsaXeGxnqR6T+2D3dKmqKX4XgwozCa9Hyor1sZe+NSRJkc aTii6o8RjMKBXPqHyrZ/BJMenabjIxjYrxstPG13ICqBy3S+j+oSa1Cp0fApEpQ6 ZFxC7tqduC0txlZpJYppuNuU+807nq2ejvNxKhVGUIHmtvmS95ZWrV1USjOf6Hf1 WKA9J0Fc/Je+rodWXe94o1mZUTD4kkTsS+mrBAVfd5bDmHjxXuMn/Zt8YvXygQrT Z/XnqVyms7elH4Rf1NpO0e82itLNqcgS7OxB8rAXasEbvONegcg= =thav -----END PGP SIGNATURE----- --rtnlwvdgxtcumpss--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170305134226.px4ivdtjjppbgiyf>