Date: Mon, 30 Nov 2015 13:01:36 -0800 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Ian Lepore <ian@freebsd.org>, Garrett Cooper <ngie@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, gjb@FreeBSD.org Subject: Re: svn commit: r290840 - head/etc Message-ID: <565CB930.2060504@FreeBSD.org> In-Reply-To: <1447597638.1254.16.camel@freebsd.org> References: <201511150304.tAF34dD2062713@repo.freebsd.org> <1447597638.1254.16.camel@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --PjE4BTg0JEUUwRwt2Vid85Oa1KkoJp46u Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 11/15/2015 6:27 AM, Ian Lepore wrote: > On Sun, 2015-11-15 at 03:04 +0000, Garrett Cooper wrote: >> Author: ngie >> Date: Sun Nov 15 03:04:39 2015 >> New Revision: 290840 >> URL: https://svnweb.freebsd.org/changeset/base/290840 >> >> Log: >> Setup the symlink to /sys to mirror one's current source, e.g. if >> my source >> tree was /usr/src/svn, /sys would point to usr/src/svn >> =20 >> This fixes the assumption that the source tree will always exist at >> ${DESTDIR}/usr/src >> =20 >> MFC after: 1 week >> PR: 76362 >> Reported by: Scot Hetzel <swhetzel@gmail.com> >> Sponsored by: EMC / Isilon Storage Division >> >> Modified: >> head/etc/Makefile >> >> 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 Sun Nov 15 01:50:17 2015 (r290839 >> ) >> +++ head/etc/Makefile Sun Nov 15 03:04:39 2015 (r290840 >> ) >> @@ -408,7 +408,7 @@ distrib-dirs: ${MTREES:N/*} distrib-clea >> ${METALOG.add} ; \ >> done; true >> .endif >> - ${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys >> + ${INSTALL_SYMLINK} ${SRCTOP:C/^\///}/sys ${DESTDIR}/sys >> .if ${MK_MAN} !=3D "no" >> cd ${DESTDIR}${SHAREDIR}/man; \ >> for mandir in man*; do \ >> >=20 > This might make some sense if DESTDIR is empty or /, but with most uses= > of non-empty DESTDIR this is just going to make a symlink to some > random place that likely won't even exist on the running system. If > source code is later installed to that DESTDIR as well, the /sys link > will just be broken in a way that's likely to lead to very confusing > errors. >=20 I have concerns this may break the install image that re@ (or other parties) produce as well since it may have a broken /sys link if not built from /usr/src. Looking at the freebsd-update kernel I see "root@releng1.nyi.freebsd.org:/usr/obj/usr/src/sys/GENERIC" which means that the freebsd-upate one should be fine. Not sure about other images. In general I think this is wrong. For meta mode staging I am tempted to disable this, but that's no different than non-meta mode really for images. I don't like the symlink at all, but having it point to usr/src is at least only 1 symlink that needs to be setup to fix all assumptions (usr/src -> /real/src), rather than now having up to 2 symlinks that need fixing. --=20 Regards, Bryan Drewery --PjE4BTg0JEUUwRwt2Vid85Oa1KkoJp46u Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJWXLkwAAoJEDXXcbtuRpfPd5oIANOZgQwAwIGtiA6sf6UxpSot S8G6RhI4XXcY640vtTVIPZRw1B62jYdKep2IHgcnb4Z5uSZayvE5B6OJ6WaDXT9q Rvkn6EmJ2IBYiHXVNuwvn0qqW2PzdE0ah5V3c8Bs+sm5Q2wWdGyZVvvRq6vZOU5i sKzFAbvHDgIJkDYT9LGyUMbygKRKfp0xp7yoFSTkp4NTurdKJdMhhanZwcFWFQ/u VN6PhyjJMrmlyBBq0nZ6xK5fsi3/R35Xl8va25fKTVqIT3OMwT2MN1o/LBhy0f/t pw72IPTmcN6afLt2wTYK81stbuOKUQnHUOojk1hsnYogGYweb0h8J1Aut1zPslU= =duzm -----END PGP SIGNATURE----- --PjE4BTg0JEUUwRwt2Vid85Oa1KkoJp46u--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?565CB930.2060504>