Date: Mon, 3 Jun 2019 13:31:53 +0200 From: Andreas Nilsson <andrnils@gmail.com> To: David Wolfskill <david@catwhisker.org>, Andreas Nilsson <andrnils@gmail.com>, current@freebsd.org Subject: Re: Post-installworld mergemaster breakage r348504 -> r348529? Message-ID: <CAPS9%2BSviSrL--r2MH1N26eqDGaci4qRQQjUzUbHUK-Feiw%2B_vg@mail.gmail.com> In-Reply-To: <20190603112743.GI1170@albert.catwhisker.org> References: <20190603110454.GH1170@albert.catwhisker.org> <CAPS9%2BSuVD=gHfKdpS2wpMFG7zsWkZzpRNJ67%2BMYhzPu=5ukpUQ@mail.gmail.com> <20190603112743.GI1170@albert.catwhisker.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Jun 3, 2019 at 1:27 PM David Wolfskill <david@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+=3D -h sha256
> > .endif
> > .if defined(DB_FROM_SRC) || defined(NO_ROOT)
> > IMAKE_INSTALL=3D INSTALL=3D"${INSTALL} ${INSTALLFLAGS}"
> > -IMAKE_MTREE=3D MTREE_CMD=3D"${MTREE_CMD} ${MTREEFLAGS}"
> > +IMAKE_MTREE=3D MTREE_CMD=3D"${MTREE} ${MTREEFLAGS}"
> > .endif
> >
> > DESTDIR_MTREEFLAGS=3D -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@catwhisker.org
> "One of the things I learned is it=E2=80=99s not about the political view=
, it=E2=80=99s
> about
> the kind of person they are.=E2=80=9D -- political reporter Dave Bryan (r=
etired)
>
> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPS9%2BSviSrL--r2MH1N26eqDGaci4qRQQjUzUbHUK-Feiw%2B_vg>