From owner-svn-src-all@freebsd.org  Thu Apr 26 13:18:25 2018
Return-Path: <owner-svn-src-all@freebsd.org>
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 96884FAD0A4;
 Thu, 26 Apr 2018 13:18:25 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 495A781091;
 Thu, 26 Apr 2018 13:18:25 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4263A18958;
 Thu, 26 Apr 2018 13:18:25 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3QDIPIa069199;
 Thu, 26 Apr 2018 13:18:25 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3QDIPNu069198;
 Thu, 26 Apr 2018 13:18:25 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201804261318.w3QDIPNu069198@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 26 Apr 2018 13:18:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r333017 - head
X-SVN-Group: head
X-SVN-Commit-Author: emaste
X-SVN-Commit-Paths: head
X-SVN-Commit-Revision: 333017
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2018 13:18:25 -0000

Author: emaste
Date: Thu Apr 26 13:18:24 2018
New Revision: 333017
URL: https://svnweb.freebsd.org/changeset/base/333017

Log:
  Correct r307825 BOOTSTRAPPING test for unsupported upgrade
  
  __FreeBSD_version has five digits after the major number, but the min
  versions in the test had an extra 0 (so the test was always false).

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Apr 26 12:23:31 2018	(r333016)
+++ head/Makefile.inc1	Thu Apr 26 13:18:24 2018	(r333017)
@@ -1851,9 +1851,9 @@ legacy: .PHONY
 # the version bump in r296219 (from July 29, 2015 -> Feb 29, 2016).
 .if ${BOOTSTRAPPING} != 0 && \
 	${WANT_COMPILER_TYPE} == "clang" && ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 30601
-.if   ${BOOTSTRAPPING} > 10000000 && ${BOOTSTRAPPING} < 1002501
+.if   ${BOOTSTRAPPING} > 1000000 && ${BOOTSTRAPPING} < 1002501
 	@echo "ERROR: Source upgrades from stable/10 prior to r286033 are not supported."; false
-.elif ${BOOTSTRAPPING} >  9000000 && ${BOOTSTRAPPING} <  903509
+.elif ${BOOTSTRAPPING} >  900000 && ${BOOTSTRAPPING} <  903509
 	@echo "ERROR: Source upgrades from stable/9 prior to r286035 are not supported."; false
 .endif
 .endif