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 >> >> This fixes the assumption that the source tree will always exist at >> ${DESTDIR}/usr/src >> >> MFC after: 1 week >> PR: 76362 >> Reported by: Scot Hetzel <swhet...@gmail.com> >> Sponsored by: EMC / Isilon Storage Division >> >> Modified: >> head/etc/Makefile >> >> Modified: head/etc/Makefile >> ===================================================================== >> ========= >> --- 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} != "no" >> cd ${DESTDIR}${SHAREDIR}/man; \ >> for mandir in man*; do \ >> > > 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. >
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 "r...@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. -- Regards, Bryan Drewery
signature.asc
Description: OpenPGP digital signature