Post-installworld mergemaster breakage r348504 -> r348529?

[David Wolfskill]

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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-current/attachments/20190603/c27edc23/attachment.sig>