cvs commit: src Makefile.inc1 src/tools/build Makefile

[Ruslan Ermilov]

On Tue, Jan 22, 2008 at 10:29:40AM -0700, M. Warner Losh wrote:
> In message: <20080122171051.GB19248 at team.vega.ru>
>             Ruslan Ermilov <ru at freebsd.org> 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 at FreeBSD.org
FreeBSD committer