From owner-svn-src-all@freebsd.org Mon Apr 8 14:27:23 2019 Return-Path: Delivered-To: svn-src-all@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 497901581057 for ; Mon, 8 Apr 2019 14:27:23 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A5DAF734BF for ; Mon, 8 Apr 2019 14:27:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x830.google.com with SMTP id v20so15557492qtv.12 for ; Mon, 08 Apr 2019 07:27:22 -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=iY2Dw+Hy7+xwMmaZWbydHw/SSV7seMW+eXIRCOkx+WY=; b=jOlAD3Ltruf+PVzRFkmj25E4cnJ2GSQ7hnRiZmKk3DYM2ibD87XWam0EcQqi0Garmg Ohnrnu9kpJ3rQkO2jk9LiJT8pPL2Otkpq1PPnaNXrE0KHrADrFMYZq5Rr+ZA6E2TpeUh CjrRzeTB/6BjM64BM5yTKx9ZZcwBfXN6RYCcUblMsRhDiCMCM/WhntdiYrwhdgaypLdV REvPyzAwalnBafsfmvXJQ9Iw6KBusI8QAFlvl/zQPijt8QVDGFhCfbm4QPgEsHbsMyXC hduIAeS2zv4SgyGqw9nXEHopZu41wurqFzE/2NOdQDeGMXMhyc3Et2CqCvvbtZBT5d1y tpOA== 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=iY2Dw+Hy7+xwMmaZWbydHw/SSV7seMW+eXIRCOkx+WY=; b=dGxsvXK/scz0LJCGNThxzzWWEXAd7eNuaUwPNHiFROqF6BlwG1/XlsOijzntK96wrA SDJPKGagQxy8M55nQkc7eYCgiksA/pzAWzpNSZG1pZKMoF2oOcbozJGOaI12SUbzR9A3 hdAuwzva49+Rl8hDUTRm0NVUGGVPL5mXQqFXsE3e9rvxQdYQwrb4CFmvrONCendKzrF6 EEZv497nHFbh4ei+Fj+W4sTef/2GhFnL3x+0ywTjJSQzl4ysZJMh998C4a6uJFPMrgnK xzKM2mfP+oO8pkfkjXTojUqadZrzJz7c86npWj9FM8AqGZMGjBZZo8TalCDHjcBvozCC +t1A== X-Gm-Message-State: APjAAAXsOnHIpoyFLtd5+le/kzIc9LYCJyPPbnFpy0int7h/fgNlpRP8 LqujOhm36pZwD/8550xJfh/PCovl6xe53qZztl1Ixw== X-Google-Smtp-Source: APXvYqzfuMa5wYTYvZLY2e56xINxp8Svcd6WUo5l/HKWeAABFT9m5dZCt6C+lYqjqzNczlAIFqVrf62/t5dqX/gWrOI= X-Received: by 2002:a0c:9922:: with SMTP id h31mr23257917qvd.137.1554733641731; Mon, 08 Apr 2019 07:27:21 -0700 (PDT) MIME-Version: 1.0 References: <201904071839.x37IduPO002007@repo.freebsd.org> <839b79cfabfc63d0077895575f317570@FreeBSD.org> In-Reply-To: <839b79cfabfc63d0077895575f317570@FreeBSD.org> From: Warner Losh Date: Mon, 8 Apr 2019 08:27:09 -0600 Message-ID: Subject: Re: svn commit: r346018 - head/sys/conf To: Chris Rees Cc: Oliver Pinter , svn-src-head , svn-src-all@freebsd.org, src-committers , Warner Losh , owner-svn-src-all@freebsd.org X-Rspamd-Queue-Id: A5DAF734BF X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.92 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.92)[-0.919,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 14:27:23 -0000 On Mon, Apr 8, 2019, 2:35 AM Chris Rees wrote: > On 2019-04-08 08:57, Oliver Pinter wrote: > > On Monday, April 8, 2019, Warner Losh wrote: > > > >> > >> > >> On Sun, Apr 7, 2019, 3:16 PM Oliver Pinter > >> > >> wrote: > >> > >>> Please revert this patch. If I'm not wrong, this will break the > >>> freebsd-version command's generation or output. > >>> > >> > >> You are going to need to be a lot more specific about this. It makes > >> no > >> sense to me at all how any of this could break that. The code is > >> identical > >> logically and produces the same result. > >> > > > > Now I double checked, it may work, but I remembered to this "black > > magic" : > > > https://github.com/freebsd/freebsd/blob/master/bin/freebsd-version/Makefile > > > > Given it will evaluate to > > BRANCH=${BRANCH_OVERRIDE:-CURRENT} > > which unless you set BRANCH_OVERRIDE, then it will still work no > problem. > And if you set that, it will still work. :) However, this should be converted to VARS_ONLY. I'll do that. I've already done and, so will now grep the whole tree for similar constructs. Warner Chris > > -- > This message has been scanned for viruses and > dangerous content by MailScanner, and is > believed to be clean. > >