From owner-freebsd-current@freebsd.org Mon Jun 3 14:15:32 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 1871F15B2435 for ; Mon, 3 Jun 2019 14:15:32 +0000 (UTC) (envelope-from wlosh@bsdimp.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 5826C826E6 for ; Mon, 3 Jun 2019 14:15:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.ysv.freebsd.org (Postfix) id 12CE315B2434; Mon, 3 Jun 2019 14:15:31 +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 E2D1315B2433 for ; Mon, 3 Jun 2019 14:15:30 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) (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 83C82826E5 for ; Mon, 3 Jun 2019 14:15:30 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x732.google.com with SMTP id g18so484927qkl.3 for ; Mon, 03 Jun 2019 07:15:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=pQxzi7xusx8l9Bs2s6v+dSmWqUbFJu/3fhKn4DP4Ly4=; b=jx4MPvQtyDm6hOCi0q/Ho8x6Qlim6c1A7flk1yriho/gJWKDmTXdBf6P3zXVygTsqs Ov4BGbroZpNcnQThaXDJ6fwViqVwKKL3ft4adYM8D2T/efR0GT+DRJGLyE+P/u1rrzXN WF3qu+HFWzLW8GZ6WWL/I6Jwm6T7fSbCF5L5SRYntjbMD3X70Tp3h2JsnFEhoDXFhMxB tGUfJ11stqNnHJP8t1D1/7fGJ9vDGbncfPMry0cSI2ILUpxlvunvwIvugHTN53Y2zFKa QaXASJzoPAMOup3Mf9PyPBgZLboP30QRmaRjyro5sZ/NgE8q0DQo1q53Y9dSWksTuOct 10AQ== 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:cc; bh=pQxzi7xusx8l9Bs2s6v+dSmWqUbFJu/3fhKn4DP4Ly4=; b=epI6GOKij25d+DnVG4yFVsp1XXlIKHxGZHoe16pYyKDrhj9Ihkrc/z4C6p0ytbFHce 2jItdbmy552pGTstGGhqmkw6WtcQ8nL7LvikWAwZYDp63vFFZr1mcUjJSDND6+hYVi6u oCV84mt/nKJVGyYiTGCteZ0vA3A9aonOBBBBf1Xu8Z+T7iF2FA6OidqJZTB+LBhR8Pvl 9whJUugZsWjXb3D4EBHzcYCHhcrGrzxRwE3Cf/5OL9paateO/uZ9Tio6njdtBl7H0dOX nZ15vd0QXW5lKSzqVuU5DfvQWuWttrSV9l9AFxPh4LC6YZm/2a9iXusXdtqAUk+dylsK enUA== X-Gm-Message-State: APjAAAVlvVNgC2yqE6HpbUTBolfDOC7JgeGjvmkK5XxktZENwCyk6tqG 7a1PL5kpg+zn7glHVtLoq2gYxtKarNvsi6+l2WNVKA== X-Google-Smtp-Source: APXvYqw96R2jtsNQ9LiAcPHdhBjuaRIlKGfoxDgatlP3o9owy9JeNN6IHCUcfXNaYn32ILZRSCtkamY0gAJKT0cXAUQ= X-Received: by 2002:a05:620a:125b:: with SMTP id a27mr22475388qkl.112.1559571329693; Mon, 03 Jun 2019 07:15:29 -0700 (PDT) MIME-Version: 1.0 References: <20190603110454.GH1170@albert.catwhisker.org> <20190603112743.GI1170@albert.catwhisker.org> In-Reply-To: From: Warner Losh Date: Mon, 3 Jun 2019 08:15:18 -0600 Message-ID: Subject: Re: Post-installworld mergemaster breakage r348504 -> r348529? To: Andreas Nilsson Cc: David Wolfskill , FreeBSD Current X-Rspamd-Queue-Id: 83C82826E5 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.96 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.961,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 14:15:32 -0000 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 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 vi= ew, it=E2=80=99s > > about > > the kind of person they are.=E2=80=9D -- 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@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org= " >