From owner-cvs-all@FreeBSD.ORG Tue Jan 22 19:00:57 2008 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D693916A46B; Tue, 22 Jan 2008 19:00:57 +0000 (UTC) (envelope-from rermilov@team.vega.ru) Received: from mail.vega.ru (infra.dev.vega.ru [90.156.167.14]) by mx1.freebsd.org (Postfix) with ESMTP id 875E413C457; Tue, 22 Jan 2008 19:00:56 +0000 (UTC) (envelope-from rermilov@team.vega.ru) Received: from [87.242.97.68] (port=56424 helo=edoofus.dev.vega.ru) by mail.vega.ru with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.68 (FreeBSD)) (envelope-from ) id 1JHOMh-0008xj-Bp; Tue, 22 Jan 2008 19:00:55 +0000 Received: from edoofus.dev.vega.ru (localhost [127.0.0.1]) by edoofus.dev.vega.ru (8.14.2/8.14.2) with ESMTP id m0MJ0fbu047217; Tue, 22 Jan 2008 22:00:41 +0300 (MSK) (envelope-from rermilov@team.vega.ru) Received: (from ru@localhost) by edoofus.dev.vega.ru (8.14.2/8.14.2/Submit) id m0MJ0ejZ047216; Tue, 22 Jan 2008 22:00:40 +0300 (MSK) (envelope-from rermilov@team.vega.ru) X-Authentication-Warning: edoofus.dev.vega.ru: ru set sender to rermilov@team.vega.ru using -f Date: Tue, 22 Jan 2008 22:00:40 +0300 From: Ruslan Ermilov To: "M. Warner Losh" Message-ID: <20080122190040.GA47055@team.vega.ru> References: <20080122155427.GB16573@team.vega.ru> <20080122.095757.1159151185.imp@bsdimp.com> <20080122171051.GB19248@team.vega.ru> <20080122.102940.1586015611.imp@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080122.102940.1586015611.imp@bsdimp.com> User-Agent: Mutt/1.5.17 (2007-11-01) Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org, obrien@FreeBSD.org Subject: Re: cvs commit: src Makefile.inc1 src/tools/build Makefile 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: Tue, 22 Jan 2008 19:00:58 -0000 On Tue, Jan 22, 2008 at 10:29:40AM -0700, M. Warner Losh wrote: > In message: <20080122171051.GB19248@team.vega.ru> > Ruslan Ermilov writes: > : > : I only wonder how was the value of 600029 choosen? > : > > : > It was two revisions before the branch point for RELENG_6, which > : > happened at 600031. > : > : I think you're twice off-by-one here, > : > : : $ cvs -R ann -rRELENG_6_BP param.h | grep '#define.*__FreeBSD_version' > : : > : : Annotations for param.h > : : *************** > : : 1.244 (sam 11-Jul-05): #define __FreeBSD_version 600032 /* Master, propagated to newvers */ > : > : but it still doesn't answer my question. Why you've choosen > : this __FreeBSD_version and not RELENG_6_BP (i.e., 600032). > : I don't mind it, just want to understand the formulae. :-) > > Maybe I should have selected this. I wanted to select the version > that would work rather than the branch point. Maybe this was silly of > me. > > : > It also is one greater than the largest if that > : > was removed. > : > : Can you elaborate on what you mean here? I don't understand. > : Thanks. > > The following line: > > .if ${BOOTSTRAPPING} < 600029 > > was the line with the biggest number on the right hand side of the < > that was removed. Meaning that anything 600029 and newer will still > work. > Got it now, thanks. How about if we restore the check whose aim was to avoid cluttering mailing lists with questions about upsupported source upgrades, but make it correspond to 6.0-RELEASE: %%% Index: Makefile.inc1 =================================================================== RCS file: /home/ncvs/src/Makefile.inc1,v retrieving revision 1.594 diff -u -p -r1.594 Makefile.inc1 --- Makefile.inc1 22 Jan 2008 15:57:57 -0000 1.594 +++ Makefile.inc1 22 Jan 2008 18:58:35 -0000 @@ -841,6 +841,10 @@ update: # legacy: Build compatibility shims for the next three targets # legacy: +.if ${BOOTSTRAPPING} < 600034 + @echo "ERROR: Source upgrades from versions prior to 6.0 not supported."; \ + false +.endif .for _tool in tools/build ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ %%% Cheers, -- Ruslan Ermilov ru@FreeBSD.org FreeBSD committer