From owner-cvs-all@FreeBSD.ORG Fri Aug 19 15:50:45 2005 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 717F116A41F; Fri, 19 Aug 2005 15:50:45 +0000 (GMT) (envelope-from cperciva@freebsd.org) Received: from pd4mo1so.prod.shaw.ca (shawidc-mo1.cg.shawcable.net [24.71.223.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C07843D45; Fri, 19 Aug 2005 15:50:44 +0000 (GMT) (envelope-from cperciva@freebsd.org) Received: from pd2mr2so.prod.shaw.ca (pd2mr2so-qfe3.prod.shaw.ca [10.0.141.109]) by l-daemon (Sun ONE Messaging Server 6.0 HotFix 1.01 (built Mar 15 2004)) with ESMTP id <0ILH009LA7JQGQ10@l-daemon>; Fri, 19 Aug 2005 09:40:38 -0600 (MDT) Received: from pn2ml9so.prod.shaw.ca ([10.0.121.7]) by pd2mr2so.prod.shaw.ca (Sun ONE Messaging Server 6.0 HotFix 1.01 (built Mar 15 2004)) with ESMTP id <0ILH00M5N7JQQBE0@pd2mr2so.prod.shaw.ca>; Fri, 19 Aug 2005 09:40:38 -0600 (MDT) Received: from [192.168.0.60] (S0106006067227a4a.vc.shawcable.net [24.87.209.6]) by l-daemon (iPlanet Messaging Server 5.2 HotFix 1.18 (built Jul 28 2003)) with ESMTP id <0ILH00H0D7JP8W@l-daemon>; Fri, 19 Aug 2005 09:40:38 -0600 (MDT) Date: Fri, 19 Aug 2005 08:40:37 -0700 From: Colin Percival In-reply-to: <43059925.3090701@FreeBSD.org> To: Doug Barton Message-id: <4305FD75.80501@freebsd.org> MIME-version: 1.0 Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7bit X-Accept-Language: en-us, en References: <200508190356.j7J3uj5D095435@repoman.freebsd.org> <43059925.3090701@FreeBSD.org> User-Agent: Mozilla Thunderbird 1.0.6 (X11/20050724) Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/conf newvers.sh X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2005 15:50:45 -0000 Doug Barton wrote: > 1. A "better" way (IMO) to write: > > if [ "X${BRANCH_OVERRIDE}" != "X" ]; then > > is > > case "${BRANCH_OVERRIDE}" in > '') ;; > *) BRANCH=${BRANCH_OVERRIDE} ;; > esac > > The original reason for writing it this way was to avoid the call to > test(1), because case is a shell builtin. This is a style issue, and not > a "must have," but I thought I'd mention it. I couldn't see anything in style(9), so I just wrote it the way I've seen most often in the FreeBSD tree; but it's good to now know _why_ I keep on seeing it written that way. :-) > I like your override idea here, but I'd rather not have to keep track of > what the current value of $BRANCH is so that I can include it in my own > override variable. What would be more useful to me (and arguably more > useful in general, although once again I will not press the point) would > be some way to add a string to the BRANCH or RELEASE variables. That wouldn't be sufficient for the purpose I have in mind. When running FreeBSD Update builds, I'll typically have a RELEASE-pX tree checked out and a security patch (which is going to get committed to the tree later); I want to be able to build tree + patch with a label of RELEASE-p{X + 1}. Of course, I could do this by applying an extra patch to the source tree before building, but the whole idea is to get rid of the local patches which I've been carrying around in FreeBSD Update. > 3. Even in the hectic environment leading up to a release, I dislike > insta-MFCs. Understood. If the -BETA3 builds hadn't been starting soon, I'd have waited the usual 72 hours. Colin Percival