From owner-freebsd-current@freebsd.org Mon Jun 3 11:27:49 2019 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 05A5315ADA56 for ; Mon, 3 Jun 2019 11:27:49 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org [IPv6:2001:1900:2254:206a::50:5]) by mx1.freebsd.org (Postfix) with ESMTP id 30F69736C5 for ; Mon, 3 Jun 2019 11:27:48 +0000 (UTC) (envelope-from david@catwhisker.org) Received: by mailman.ysv.freebsd.org (Postfix) id E0C6415ADA55; Mon, 3 Jun 2019 11:27:47 +0000 (UTC) Delivered-To: current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CDEA615ADA54 for ; Mon, 3 Jun 2019 11:27:47 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [198.144.209.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 169C3736BE for ; Mon, 3 Jun 2019 11:27:46 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.15.2/8.15.2) with ESMTP id x53BRhra015337; Mon, 3 Jun 2019 11:27:43 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.15.2/8.15.2/Submit) id x53BRhPP015336; Mon, 3 Jun 2019 04:27:43 -0700 (PDT) (envelope-from david) Date: Mon, 3 Jun 2019 04:27:43 -0700 From: David Wolfskill To: Andreas Nilsson Cc: current@freebsd.org Subject: Re: Post-installworld mergemaster breakage r348504 -> r348529? Message-ID: <20190603112743.GI1170@albert.catwhisker.org> Mail-Followup-To: David Wolfskill , Andreas Nilsson , current@freebsd.org References: <20190603110454.GH1170@albert.catwhisker.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="tH81YkO9bF1TqYxP" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.12.0 (2019-05-25) X-Rspamd-Queue-Id: 169C3736BE X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.983,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jun 2019 11:27:49 -0000 --tH81YkO9bF1TqYxP Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jun 03, 2019 at 01:17:44PM +0200, Andreas Nilsson wrote: > ... > > Any hints? > ....=20 > 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 >=20 > DESTDIR_MTREEFLAGS=3D -deU >=20 > 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 --=20 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=20 the kind of person they are.=E2=80=9D -- political reporter Dave Bryan (ret= ired) See http://www.catwhisker.org/~david/publickey.gpg for my public key. --tH81YkO9bF1TqYxP Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAlz1BC9fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcmPjwgAg38lW80L6+fhm/HU9uy9NrlIX9FBaeEAUm2Qk1qsb6TwLcwf2KySglrr NFCl23vJkzbRJeBb5VjJ/gmDnkRg8KB0VaqlxyEx/EYHdqVWTGcVI93/FTpGkfNH u0JpmibMMHfk9OtITBtMDLnUsH0ES87YOwLl8QNj2lgHcHpkbcnNlfYpSWX/7qDJ h6ApgtgjSKPMqNlfn5rIc7aGawZQU6yujnM+uAZnn65LkCkcPvKrpt/LdGdIDSVg A7tTpCDGoxwgPZ8T6Ys//qr0M6zXIYSKDx1tsCy4JhQzWck/0P5MPLiJ8O5uhZjc 07bdBSOn0GzFGXp3LCnKxVeBWZrZFw== =5Qx3 -----END PGP SIGNATURE----- --tH81YkO9bF1TqYxP--