> 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.
A quick and incomplete look at this leads me to believe that much of the
mtree related stuff in src/Makefile.inc1 should of been in src/etc
in the first place.
It ends up invoking etc/Makefile in the end anyway.
Can someone explain why this is pulled up a level?
Why do we now have distrib-dirs, distribution in
src/Makefile.inc1, these were and should be in etc/Makefile?
iirc hierarchy was pulled up to src/Makefile at one point,
but forgetting the reasoning for that.
> 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
> -
> MTREES= mtree/BSD.root.dist / \
> mtree/BSD.var.dist /var \
> mtree/BSD.usr.dist /usr \
>
>
--
Rod Grimes rgri...@freebsd.org
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
