svn commit: r348521 - in head: . etc sys/conf sys/modules usr.bin/login usr.sbin/services_mkdb

[Enji Cooper]

Hi Maxim,

> On Jun 2, 2019, at 16:38, Maxim Sobolev <sobomax at freebsd.org> wrote:
> 
> Author: sobomax
> Date: Sun Jun  2 23:38:19 2019
> New Revision: 348521
> URL: https://svnweb.freebsd.org/changeset/base/348521
> 
> Log:
>  Fix several places where tool name has been hardcoded:
> 
>      install -> ${INSTALL}
>      mtree -> ${MTREE_CMD}
>      services_mkdb -> ${SERVICES_MKDB_CMD}
>      cap_mkdb -> ${CAP_MKDB_CMD}
>      pwd_mkdb -> ${PWD_MKDB_CMD}
>      kldxref -> ${KLDXREF_CMD}
> 
>  If you do custom FreeBSD builds you may want to override those
>  in some cases.
> 
>  Sponsored by:    Sippy Software, Inc.

    Please get review from Bryan, Simon, or Warner next time, per MAINTAINERS, to avoid breakage in the future. There are some sand traps in our build infrastructure.

...

> Modified: head/Makefile.inc1
> ==============================================================================
> --- head/Makefile.inc1    Sun Jun  2 22:27:26 2019    (r348520)
> +++ head/Makefile.inc1    Sun Jun  2 23:38:19 2019    (r348521)
> @@ -887,8 +887,8 @@ MTREEFLAGS+=    -W
> INSTALLFLAGS+=    -h sha256
> .endif
> .if defined(DB_FROM_SRC) || defined(NO_ROOT)
> -IMAKE_INSTALL=    INSTALL="install ${INSTALLFLAGS}"
> -IMAKE_MTREE=    MTREE_CMD="mtree ${MTREEFLAGS}"
> +IMAKE_INSTALL=    INSTALL="${INSTALL} ${INSTALLFLAGS}"
> +IMAKE_MTREE=    MTREE_CMD="${MTREE_CMD} ${MTREEFLAGS}"
> .endif

    Please back out this part of the change as it is unnecessary and adds a dependency on sys.mk’s definitions. $PATH should contain, i.e., be populated, with these tools when running make installworld. This is part of the logic behind how $ITOOLS, etc, works.
    Thank you very much for your work and the rest of the change though!
-Enji