From owner-svn-src-all@freebsd.org Mon Sep 14 17:12:05 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4EC623DCD40 for ; Mon, 14 Sep 2020 17:12:05 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BqtFc3xwTz40l5 for ; Mon, 14 Sep 2020 17:12:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x834.google.com with SMTP id p65so521038qtd.2 for ; Mon, 14 Sep 2020 10:12:04 -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=Msqw7+20VOncyXRhA8kS8UVVfUicMIM7evKDhbFzRwQ=; b=I9Se05RfJcDD4DkWHD7e8Gjqg+WIUntlJ7OY9SjQvooOGFoFVAtJux6D6TdbmZO47k d/GtRNr4xYXWJdHZcHx8MKtJdRUaINkYIO0MlAmb17f1fPKFVOGI7BthCOOGDYc+UMap r8UoS9Z6nUEqkV49+KxvOW8VYteXBMYLtUQdrlOluxI+ggfJT66X8+IaJlrQWVM/gjOk lRjBkSxjE3W9kjGRNsoRhr0JaBxvqg3YDTsmYY5AT3TuMFrUfg+QFXjfuG+wUtaUs03E je8v39eQ4PYF4sq5b3HjvOxh2xpJI9amd9BDwr3iy5M8iSpzjcnDtiGq2pTlAE6kfMXq EEcQ== 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=Msqw7+20VOncyXRhA8kS8UVVfUicMIM7evKDhbFzRwQ=; b=XfPCemt4p5WI7wtVDJFw030olHeTfJ0TcfqafXjnl0shfwytH+KAey7X7wyCyHWlkO xEYG3B2maq/jB3EljxE4LvkECIPQUhnGPjWZQ2REipFeHl3RHvFXoO7jbdnq5XhUttJ5 K+IJKbr7/LP954kuiiHhDqdtcs01oZADUerREycK3mFNfbcn6WE5VcdvKji185XhaD7n OAXjCS3zbcnPBexzC5Zzb1I6blrS4y1pqgqe8xcECdAeqph23qfCFPBQbmGliuMJYzmi IX2IA5I8Ui6NF4iRBaxeZNpeRQhRUt7+kKdWMcwyYRs0Jrt6YCqQ1NamLGCSu5fChZSS 283Q== X-Gm-Message-State: AOAM533wtysYF7dLaYKwUgsD6c1hAQhLx4S8lkexsaWC/20D2VqLCC2v Ze1qKgpBc00FklsL2jCVrm6i91JDkvqYyAxNI3UdW/eZjcstGw== X-Google-Smtp-Source: ABdhPJzBFttDDGvS3UajesHnJXE8EcEx8Te2KqYId8mfm/ahFY9tqIRlySQnF/veNm5hLqy42IuYsdq6dRi9EDBJnao= X-Received: by 2002:ac8:4cd0:: with SMTP id l16mr14018466qtv.175.1600103523274; Mon, 14 Sep 2020 10:12:03 -0700 (PDT) MIME-Version: 1.0 References: <202009141445.08EEjVY5092564@repo.freebsd.org> In-Reply-To: <202009141445.08EEjVY5092564@repo.freebsd.org> From: Warner Losh Date: Mon, 14 Sep 2020 11:11:52 -0600 Message-ID: Subject: Re: svn commit: r365720 - head/sys/conf To: Gordon Tetlow Cc: src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 4BqtFc3xwTz40l5 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=I9Se05Rf; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::834) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.37 / 15.00]; ARC_NA(0.00)[]; MAILMAN_DEST(0.00)[svn-src-all]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-0.98)[-0.976]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-1.002]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-0.39)[-0.394]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::834:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.33 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 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, 14 Sep 2020 17:12:05 -0000 On Mon, Sep 14, 2020 at 8:45 AM Gordon Tetlow wrote: > Author: gordon > Date: Mon Sep 14 14:45:30 2020 > New Revision: 365720 > URL: https://svnweb.freebsd.org/changeset/base/365720 > > Log: > Partially revert r346018 and use the if/then construct instead of shell. > > There are a couple of places in the tree that directly parse the > newvers.sh > script looking for the BRANCH variable. I found two locations, one in > release/Makefile and the other in bin/freebsd-version/Makefile. > > While there is a good argument that BRANCH_OVERRIDE should properly > propagate in those circumstances and the new behavior is thus better, the > reality is this change broke freebsd-update's ability to find timestamps > in > binaries and resulted in a large number of gratuitous changes. > Where? I fixed all those ages ago. Warner > Reported by: freebsd-update > Discussed with: cperciva > MFC after: 1 day > > Modified: > head/sys/conf/newvers.sh > > Modified: head/sys/conf/newvers.sh > > ============================================================================== > --- head/sys/conf/newvers.sh Mon Sep 14 14:24:54 2020 (r365719) > +++ head/sys/conf/newvers.sh Mon Sep 14 14:45:30 2020 (r365720) > @@ -54,7 +54,10 @@ > > TYPE="FreeBSD" > REVISION="13.0" > -BRANCH="${BRANCH_OVERRIDE:-CURRENT}" > +BRANCH="CURRENT" > +if [ -n "${BRANCH_OVERRIDE}" ]; then > + BRANCH=${BRANCH_OVERRIDE} > +fi > RELEASE="${REVISION}-${BRANCH}" > VERSION="${TYPE} ${RELEASE}" > >