Date: Mon, 3 Jun 2019 07:28:46 -0700 From: Enji Cooper <yaneurabeya@gmail.com> To: Maxim Sobolev <sobomax@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r348521 - in head: . etc sys/conf sys/modules usr.bin/login usr.sbin/services_mkdb Message-ID: <99965642-23AF-492C-9D3E-19AE069AB323@gmail.com> In-Reply-To: <201906022338.x52NcJV9070782@repo.freebsd.org> References: <201906022338.x52NcJV9070782@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi Maxim, > On Jun 2, 2019, at 16:38, Maxim Sobolev <sobomax@freebsd.org> wrote: >=20 > Author: sobomax > Date: Sun Jun 2 23:38:19 2019 > New Revision: 348521 > URL: https://svnweb.freebsd.org/changeset/base/348521 >=20 > Log: > Fix several places where tool name has been hardcoded: >=20 > install -> ${INSTALL} > mtree -> ${MTREE_CMD} > services_mkdb -> ${SERVICES_MKDB_CMD} > cap_mkdb -> ${CAP_MKDB_CMD} > pwd_mkdb -> ${PWD_MKDB_CMD} > kldxref -> ${KLDXREF_CMD} >=20 > If you do custom FreeBSD builds you may want to override those > in some cases. >=20 > Sponsored by: Sippy Software, Inc. Please get review from Bryan, Simon, or Warner next time, per MAINTAINER= S, to avoid breakage in the future. There are some sand traps in our build i= nfrastructure. ... > Modified: head/Makefile.inc1 > =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/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+=3D -W > INSTALLFLAGS+=3D -h sha256 > .endif > .if defined(DB_FROM_SRC) || defined(NO_ROOT) > -IMAKE_INSTALL=3D INSTALL=3D"install ${INSTALLFLAGS}" > -IMAKE_MTREE=3D MTREE_CMD=3D"mtree ${MTREEFLAGS}" > +IMAKE_INSTALL=3D INSTALL=3D"${INSTALL} ${INSTALLFLAGS}" > +IMAKE_MTREE=3D MTREE_CMD=3D"${MTREE_CMD} ${MTREEFLAGS}" > .endif Please back out this part of the change as it is unnecessary and adds a d= ependency on sys.mk=E2=80=99s definitions. $PATH should contain, i.e., be po= pulated, with these tools when running make installworld. This is part of th= e logic behind how $ITOOLS, etc, works. Thank you very much for your work and the rest of the change though! -Enji=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?99965642-23AF-492C-9D3E-19AE069AB323>