svn commit: r245752 - in head: etc share/mk

Chris Rees crees at FreeBSD.org
Tue Jan 22 17:56:07 UTC 2013


On 21 January 2013 22:40, Brooks Davis <brooks at freebsd.org> wrote:
> Author: brooks
> Date: Mon Jan 21 22:40:39 2013
> New Revision: 245752
> URL: http://svnweb.freebsd.org/changeset/base/245752
>
> Log:
>   Replace all known uses of ln in the build process with appropriate
>   install -l invocations via new INSTALL_LINK and INSTALL_SYMLINK
>   variables.
>
>   Sponsored by: DARPA, AFRL
>   Reviewed by:  ian, ray, rpaulo
>
> Modified:
>   head/etc/Makefile
>   head/share/mk/bsd.incs.mk
>   head/share/mk/bsd.info.mk
>   head/share/mk/bsd.lib.mk
>   head/share/mk/bsd.links.mk
>   head/share/mk/bsd.man.mk
>   head/share/mk/bsd.own.mk
>
> Modified: head/etc/Makefile
> ==============================================================================
> --- head/etc/Makefile   Mon Jan 21 22:32:00 2013        (r245751)
> +++ head/etc/Makefile   Mon Jan 21 22:40:39 2013        (r245752)
> @@ -324,26 +324,29 @@ distrib-dirs:
>                     -f $$m -p $$d; \
>                 ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \
>         done; true
> -       ln -sfh usr/src/sys ${DESTDIR}/sys
> +       ${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys

This broke installworld for me, because of the different behaviour.

ln -sf overwrites existing symlinks, whereas install -l a b puts a
symlink to a inside itself... which fails on a read-only src (NFS
mounted).

Perhaps it's install misbehaving?  I can't work out if it's
bootstrapped properly; we should be using new install(1), are we?

Chris


More information about the svn-src-all mailing list