From owner-freebsd-current@freebsd.org Mon Jun 3 11:32:07 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 6E90615ADD6F for ; Mon, 3 Jun 2019 11:32:07 +0000 (UTC) (envelope-from andrnils@gmail.com) 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 D1FAA73B80 for ; Mon, 3 Jun 2019 11:32:06 +0000 (UTC) (envelope-from andrnils@gmail.com) Received: by mailman.ysv.freebsd.org (Postfix) id 9316615ADD6E; Mon, 3 Jun 2019 11:32:06 +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 6C77615ADD6D for ; Mon, 3 Jun 2019 11:32:06 +0000 (UTC) (envelope-from andrnils@gmail.com) Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C450473B7C for ; Mon, 3 Jun 2019 11:32:05 +0000 (UTC) (envelope-from andrnils@gmail.com) Received: by mail-lf1-x131.google.com with SMTP id a9so11886925lff.7 for ; Mon, 03 Jun 2019 04:32:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=vkg8jfsXGh9gOfi1AAinEpn5YeoSsro4JxORCgGI5eU=; b=fItICz5Fkq80RA9SH4r3YYgDbGGHvjVLt1W7o/EVthL/a4rS8xpRWuu1ku71CVBvAt BpKXop3P2cxEzYgEbjkfU54CQEd9AM9M8swF6JPC4S0+2e6fQVFA0rVuby4vD0tHYPSf QZNnehpkyNpJHe5x/2xyL+wtpu1cywAzn1l96iH76xItHe9Rj7LJXPVOC74kI4WyUl19 U3TxYoNOT3YbaxHGid3+Jb0tYte8yPWhacpRahzGnVEAMNoJ3bZg2wMUOKwpv84eA/97 rLuTne+uhm13zqrmfaP5sfl5tRONrmSvDYw9bT+ZtJZ4O+Sje+HFir6UuKf20zig8nsz 7l9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=vkg8jfsXGh9gOfi1AAinEpn5YeoSsro4JxORCgGI5eU=; b=VgpN2l12RMpqnEno+iF8bSPHka5PeeEqAFfiHYO/crzXWckvJuPu2bHX0TWOTPqrU1 wQKNGTI1zmorIe3RvyZKaD/fkQ2p0fxEWy/5D9I65m5lFl0An0shBX9jz7ZiOLvkwEF5 0Obs8Qw+BqqLn/nNQhR7nh7cF6wQd84IvGpKLnLOPK53YIfrO4c3xe3PSf7QrkbZdHzj XLIThkc0MAAIQ39pphi/WusjU58YcIWOUPp+ZgNSDkCj01zs31v4sX0nx8F+meh7pnDd bNUc6AN56WLr9u9iVVckvIQ1YR4un8rTgabnYaBl0idYI/9ZV6eFOxSSzqLd3pdNLygI IERA== X-Gm-Message-State: APjAAAXI2msuoANwl9qdcezfPVhI3/S97nMyIAEUhvhhrcrHoWuDc5vv eNmMIR/KtqlYTr+lLhKBK0unrIdBBZ0E93Qfufz8vA== X-Google-Smtp-Source: APXvYqyjnYINao+eocxoCTWBohIPvn/qRQOOe3kibLOn3bbnl90Ts7O8gSZy6guobtFuQhO2QeJKNOWGFR8X1fyaGy0= X-Received: by 2002:ac2:5e9b:: with SMTP id b27mr11591515lfq.45.1559561524386; Mon, 03 Jun 2019 04:32:04 -0700 (PDT) MIME-Version: 1.0 References: <20190603110454.GH1170@albert.catwhisker.org> <20190603112743.GI1170@albert.catwhisker.org> In-Reply-To: <20190603112743.GI1170@albert.catwhisker.org> From: Andreas Nilsson Date: Mon, 3 Jun 2019 13:31:53 +0200 Message-ID: Subject: Re: Post-installworld mergemaster breakage r348504 -> r348529? To: David Wolfskill , Andreas Nilsson , current@freebsd.org X-Rspamd-Queue-Id: C450473B7C 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.977,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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:32:07 -0000 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..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