svn commit: r348532 - in head: . etc

[Mark Johnston]

On Mon, Jun 03, 2019 at 03:12:45PM +0000, Maxim Sobolev wrote:
> Author: sobomax
> Date: Mon Jun  3 15:12:44 2019
> New Revision: 348532
> URL: https://svnweb.freebsd.org/changeset/base/348532
> 
> Log:
>   Leave mtree hardcoded for now. Reverting partially 348521 and also
>   the followup stopgap change, because I don't think it's a correct. I still
>   need to figure out where to stick it in. In cannot be in Makefile.inc1
>   and it cannot be in etc/Makefile from the looks of it to avoid
>   chicken-and-egg problem.
> 
> Modified:
>   head/Makefile.inc1
>   head/etc/Makefile
> 
> Modified: head/Makefile.inc1
> ==============================================================================
> --- head/Makefile.inc1	Mon Jun  3 15:10:37 2019	(r348531)
> +++ head/Makefile.inc1	Mon Jun  3 15:12:44 2019	(r348532)
> @@ -888,7 +888,7 @@ INSTALLFLAGS+=	-h sha256
>  .endif
>  .if defined(DB_FROM_SRC) || defined(NO_ROOT)
>  IMAKE_INSTALL=	INSTALL="${INSTALL} ${INSTALLFLAGS}"
> -IMAKE_MTREE=	MTREE_CMD="${MTREE} ${MTREEFLAGS}"
> +IMAKE_MTREE=	MTREE_CMD="mtree ${MTREEFLAGS}"
>  .endif
>  
>  DESTDIR_MTREEFLAGS=	-deU
> 
> Modified: head/etc/Makefile
> ==============================================================================
> --- head/etc/Makefile	Mon Jun  3 15:10:37 2019	(r348531)
> +++ head/etc/Makefile	Mon Jun  3 15:12:44 2019	(r348532)
> @@ -93,8 +93,6 @@ distribution:
>  .endif
>  .endif
>  
> -MTREE_CMD?=	mtree
> -

I don't see how this can be right.  Nothing sets MTREE_CMD if
!defined(DB_FROM_SRC) && !defined(NO_ROOT), so now a regular
installworld fails for me:

--------------------------------------------------------------                                                                                                
 >>> Making hierarchy                                                                                                                                          
--------------------------------------------------------------                                                                                                
cd /usr/home/markj/src/freebsd-dev; make -f Makefile.inc1  LOCAL_MTREE= hierarchy                                                                             
[...]
-deU -i -f /usr/home/markj/src/freebsd-dev/etc/mtree/BSD.root.dist -p /                                                                                       
/tmp/install.ClQih1mt/sh: -deU: not found                                                                                                                     
*** Error code 127