From owner-svn-src-all@freebsd.org Mon Apr 8 07:57:02 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 4A80E15783D5 for ; Mon, 8 Apr 2019 07:57:02 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-yw1-xc33.google.com (mail-yw1-xc33.google.com [IPv6:2607:f8b0:4864:20::c33]) (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 CE9F48CEB1 for ; Mon, 8 Apr 2019 07:57:01 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-yw1-xc33.google.com with SMTP id c4so4585713ywa.11 for ; Mon, 08 Apr 2019 00:57:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=hnLKzkcVELDs/iDYXVSSD974j3hRta/POYXccSouawg=; b=P8mN9ujJQZeN2Rtv7BdlIk6kdE7gWA5jfm9NRq6NSaBAoGztNwi/4+Ylq5axxgO4Pu WkrWkr1Av/aTxQqZ+UAfUZHfQB6GUB0hHfCvvI7DoAfoYT5aL9nOrjMrP3xwh0FrQi8E RxnjsxlMNYyeiRxnf32Nu/2dhNtIx6oulAZhwgYgvAQ3ZkoY10vnZzsq4ignxREqJ4pK xixv7XD6GXeqQ1sqRw/XQUpEaMvsgCJo/cVJEYs9Cqnja/o8SeS8cuxPbkKoLrEtxzk0 X11693QtQVv/MUeh6NOSzCB85O7bE5W3+okq5iBbfGDcYyyTKY7yLyWSjE8cCSMPDkeS bVuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=hnLKzkcVELDs/iDYXVSSD974j3hRta/POYXccSouawg=; b=iTrg+ar2nRr329a5fNQ5UvrUAvfOy3ghz58z/FTGdNWCdEpMcfRIOydR8K/Wm5wtZp hx8tituC+hfyQO1qKHSJx7whyGFtIHbKDVM+YmLjjw0q4+FzbkElGIpgYz0s2g2SvjhL 2WDwD3P9FHLgz2byTc+TrALJqasmGOtmK7YIY9c8aP0942kly/BsKoR+tosBAR9Bcrde VObkfsP+GRXt92Z/6WzMBAOm69s03svYHyW4cHWIdR2EdjAIxKKv7lrjwFVtee4Q3aFo OuYuMDw68XhaN3l3L2C7J4+HfbNVwFK0mIOq/5Tl+gxmhpAMEBnPhrZiiFP4QSFmfIfJ 59Eg== X-Gm-Message-State: APjAAAVdJpRrrwUI6L+KUyPqNuGJ9bgNZmmgBPmlcblrQyflHUOHKa3S UODKkC7pmaWn9fIleHlU5Fejbk8M6JtRWf0/nU06qA== X-Google-Smtp-Source: APXvYqyMEtHLSi+6N/7LXtmRKr9d6Bw0UJcZT6GkDLL7XkN4Oxu4RRcDGvTeO2DOaEHC9cToJydjnVqvC1dyVuIopj4= X-Received: by 2002:a81:1393:: with SMTP id 141mr21946237ywt.140.1554710221122; Mon, 08 Apr 2019 00:57:01 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a25:810e:0:0:0:0:0 with HTTP; Mon, 8 Apr 2019 00:57:00 -0700 (PDT) In-Reply-To: References: <201904071839.x37IduPO002007@repo.freebsd.org> From: Oliver Pinter Date: Mon, 8 Apr 2019 09:57:00 +0200 Message-ID: Subject: Re: svn commit: r346018 - head/sys/conf To: Warner Losh Cc: Warner Losh , src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" X-Rspamd-Queue-Id: CE9F48CEB1 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.984,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] 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 07:57:02 -0000 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 > > Warner > > > On Sunday, April 7, 2019, Warner Losh wrote: >> >>> Author: imp >>> Date: Sun Apr 7 18:39:55 2019 >>> New Revision: 346018 >>> URL: https://svnweb.freebsd.org/changeset/base/346018 >>> >>> Log: >>> Use default shell assignment rather more complicated if then >>> construct. >>> >>> Discussed with: emaste@, allanjude@ (changes (or not) based on their >>> feedback) >>> Differential Revision: https://reviews.freebsd.org/D19797 >>> >>> Modified: >>> head/sys/conf/newvers.sh >>> >>> Modified: head/sys/conf/newvers.sh >>> ============================================================ >>> ================== >>> --- head/sys/conf/newvers.sh Sun Apr 7 18:31:45 2019 (r346017) >>> +++ head/sys/conf/newvers.sh Sun Apr 7 18:39:55 2019 (r346018) >>> @@ -46,10 +46,7 @@ >>> >>> TYPE="FreeBSD" >>> REVISION="13.0" >>> -BRANCH="CURRENT" >>> -if [ -n "${BRANCH_OVERRIDE}" ]; then >>> - BRANCH=${BRANCH_OVERRIDE} >>> -fi >>> +BRANCH=${BRANCH_OVERRIDE:-CURRENT} >>> RELEASE="${REVISION}-${BRANCH}" >>> VERSION="${TYPE} ${RELEASE}" >>> >>> @@ -108,21 +105,16 @@ if [ -z "${SYSDIR}" ]; then >>> SYSDIR=$(dirname $0)/.. >>> fi >>> >>> -if [ -n "${PARAMFILE}" ]; then >>> - RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ >>> {print $3}' \ >>> - ${PARAMFILE}) >>> -else >>> - RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ >>> {print $3}' \ >>> - ${SYSDIR}/sys/param.h) >>> -fi >>> +RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \ >>> + ${PARAMFILE:-${SYSDIR}/sys/param.h}) >>> >>> -b=share/examples/etc/bsd-style-copyright >>> if [ -r "${SYSDIR}/../COPYRIGHT" ]; then >>> year=$(sed -Ee '/^Copyright .* The FreeBSD >>> Project/!d;s/^.*1992-([0-9]*) .*$/\1/g' ${SYSDIR}/../COPYRIGHT) >>> else >>> year=$(date +%Y) >>> fi >>> # look for copyright template >>> +b=share/examples/etc/bsd-style-copyright >>> for bsd_copyright in ../$b ../../$b ../../../$b /usr/src/$b /usr/$b >>> do >>> if [ -r "$bsd_copyright" ]; then >>> @@ -150,9 +142,7 @@ COPYRIGHT="$COPYRIGHT >>> >>> # VARS_ONLY means no files should be generated, this is just being >>> # included. >>> -if [ -n "$VARS_ONLY" ]; then >>> - return 0 >>> -fi >>> +[ -n "$VARS_ONLY" ] && return 0 >>> >>> LC_ALL=C; export LC_ALL >>> if [ ! -r version ] >>> _______________________________________________ >>> svn-src-head@freebsd.org mailing list >>> https://lists.freebsd.org/mailman/listinfo/svn-src-head >>> To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" >>> >>