Re: Post-installworld mergemaster breakage r348504 -> r348529?

2019-06-03 Thread David Wolfskill
On Mon, Jun 03, 2019 at 08:15:18AM -0600, Warner Losh wrote: > I just committed this as a stop-gap fix. > > Warner > Cool. I encountered the issue on my build box -- laptop was still busy with other stuff. Later, when the laptop was ready for the same update to head, I applied the change p

Re: Post-installworld mergemaster breakage r348504 -> r348529?

2019-06-03 Thread Warner Losh
I just committed this as a stop-gap fix. Warner On Mon, Jun 3, 2019 at 5:33 AM Andreas Nilsson wrote: > On Mon, Jun 3, 2019 at 1:27 PM David Wolfskill > wrote: > > > On Mon, Jun 03, 2019 at 01:17:44PM +0200, Andreas Nilsson wrote: > > > ... > > > > Any hints? > > > > > > > > Might this be

Re: Post-installworld mergemaster breakage r348504 -> r348529?

2019-06-03 Thread Andreas Nilsson
On Mon, Jun 3, 2019 at 1:27 PM David Wolfskill 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..60ac649

Re: Post-installworld mergemaster breakage r348504 -> r348529?

2019-06-03 Thread David Wolfskill
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 +8

Re: Post-installworld mergemaster breakage r348504 -> r348529?

2019-06-03 Thread Andreas Nilsson
On Mon, Jun 3, 2019 at 1:06 PM David Wolfskill wrote: > I see: > > ... > -- > >>> Installing everything completed on Mon Jun 3 03:48:55 PDT 2019 > -- > Mon Jun 3 03:48:55 PDT

Post-installworld mergemaster breakage r348504 -> r348529?

2019-06-03 Thread 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/temproo