Post-installworld mergemaster breakage r348504 -> r348529?

[Andreas Nilsson]

On Mon, Jun 3, 2019 at 1:06 PM David Wolfskill <david at catwhisker.org> wrote:

> I see:
>
> ...
> --------------------------------------------------------------
> >>> Installing everything completed on Mon Jun  3 03:48:55 PDT 2019
> --------------------------------------------------------------
> Mon Jun  3 03:48:55 PDT 2019
>
> *** Creating the temporary root environment in /var/tmp/temproot
>  *** /var/tmp/temproot ready for use
>  *** Creating and populating directory structure in /var/tmp/temproot
>
> /bin/sh: -N: not found
>
>   *** FATAL ERROR: Cannot 'cd' to /usr/src and install files to
>       the temproot environment
>
>
>
> (using my usual set of csh aliases, so trying again "manually"):
>
> freebeast(13.0-C)[1] cd /usr/src
> freebeast(13.0-C)[2] mergemaster -F -U -u 0022 -i
>
> *** The directory specified for the temporary root environment,
>     /var/tmp/temproot, exists.  This can be a security risk if untrusted
>     users have access to the system.
>
>   Use 'd' to delete the old /var/tmp/temproot and continue
>   Use 't' to select a new temporary root directory
>   Use 'e' to exit mergemaster
>
>   Default is to use /var/tmp/temproot as is
>
> How should I deal with this? [Use the existing /var/tmp/temproot] d
>
>    *** Deleting the old /var/tmp/temproot
>
> *** Creating the temporary root environment in /var/tmp/temproot
>  *** /var/tmp/temproot ready for use
>  *** Creating and populating directory structure in /var/tmp/temproot
>
> /bin/sh: -N: not found
>
>   *** FATAL ERROR: Cannot 'cd' to /usr/src and install files to
>       the temproot environment
>
> freebeast(13.0-C)[3]
>
>
> As for the environment:
>
> FreeBSD freebeast.catwhisker.org 13.0-CURRENT FreeBSD 13.0-CURRENT #573
> r348504M/348508: Sun Jun  2 09:00:52 PDT 2019
> root at freebeast.catwhisker.org:/common/S4/obj/usr/src/amd64.amd64/sys/GENERIC
> amd64
>
> freebeast(13.0-C)[16] grep -v '^#' /etc/make.conf
> SENDMAIL_MC=/etc/mail/client.mc
> freebeast(13.0-C)[17]
>
> freebeast(13.0-C)[17] grep -v '^#' /etc/src.conf
>
> WITHOUT_DEBUG_FILES=1
> WITH_ELFCOPY_AS_OBJCOPY=1
> freebeast(13.0-C)[18]
>
> freebeast(13.0-C)[19] grep -v '^#' /etc/src-env.conf
> WITH_META_MODE=yes
> freebeast(13.0-C)[20]
>
> I find "-N ..." in /usr/src/Makefile.inc1 (for INSTALLFLAGS and
> MTREEFLAGS, but I don't see how that would cause this.  And I've
> been doing this (tracking head daily) for ... "a while" (usually
> without incident).
>
> Any hints?
>
> Thanks!
>
> Peace,
> david
> --
> David H. Wolfskill                              david at catwhisker.org
> "One of the things I learned is it’s not about the political view, it’s
> about
> the kind of person they are.” -- political reporter Dave Bryan (retired)
>
> See http://www.catwhisker.org/~david/publickey.gpg for my public key.
>


Might this be the same I noticed with "make packages", ie:
diff --git a/Makefile.inc1 b/Makefile.inc1
index 6c77c8abdb8..60ac6493c95 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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_CMD} ${MTREEFLAGS}"
+IMAKE_MTREE=   MTREE_CMD="${MTREE} ${MTREEFLAGS}"
 .endif

 DESTDIR_MTREEFLAGS=    -deU

Best regards
Andreas