Post-installworld mergemaster breakage r348504 -> r348529?

[Warner Losh]

I just committed this as a stop-gap fix.

Warner

On Mon, Jun 3, 2019 at 5:33 AM Andreas Nilsson <andrnils at gmail.com> wrote:

> On Mon, Jun 3, 2019 at 1:27 PM David Wolfskill <david at catwhisker.org>
> wrote:
>
> > On Mon, Jun 03, 2019 at 01:17:44PM +0200, Andreas Nilsson wrote:
> > > ...
> > > > Any hints?
> > > ....
> >
> > > 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
> > > ....
> >
> > Thank you!  Yes; that fixes it.
> >
> > (Sorry for failing to recognize that the git hash you cited was related
> > to the r348504 - r348529 range....)
> >
> > 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.
> >
>
>
> Great :)
>
> I just want to point out that I'm not certain my "fix" does the right
> thing; it works for me for building packages for amd64 on amd64, I'm not
> sure it correctly handles crossbuilding, so I would wait for an upstream
> fix for any production workloads.
>
> Best regards
> Andreas
> _______________________________________________
> freebsd-current at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-current-unsubscribe at freebsd.org"
>