From owner-svn-src-stable-12@freebsd.org Fri Aug 28 00:00:39 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 14C683C726B; Fri, 28 Aug 2020 00:00:39 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bd09L6rGPz3Swr; Fri, 28 Aug 2020 00:00:38 +0000 (UTC) (envelope-from gjb@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 CE5CCC39C; Fri, 28 Aug 2020 00:00:38 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07S00ceK042397; Fri, 28 Aug 2020 00:00:38 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07S00cm0042394; Fri, 28 Aug 2020 00:00:38 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202008280000.07S00cm0042394@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 28 Aug 2020 00:00:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r364897 - in stable/12: . lib/clang sys/conf X-SVN-Group: stable-12 X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in stable/12: . lib/clang sys/conf X-SVN-Commit-Revision: 364897 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Aug 2020 00:00:39 -0000 Author: gjb Date: Fri Aug 28 00:00:37 2020 New Revision: 364897 URL: https://svnweb.freebsd.org/changeset/base/364897 Log: Rename stable/12 to 12.2-PRERELEASE, marking the start of the 12.2 release cycle. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: stable/12/Makefile.inc1 stable/12/Makefile.libcompat stable/12/lib/clang/llvm.build.mk stable/12/sys/conf/newvers.sh Modified: stable/12/Makefile.inc1 ============================================================================== --- stable/12/Makefile.inc1 Thu Aug 27 23:57:30 2020 (r364896) +++ stable/12/Makefile.inc1 Fri Aug 28 00:00:37 2020 (r364897) @@ -126,9 +126,9 @@ TARGET_ABI= gnueabi .endif .endif MACHINE_ABI?= unknown -MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd12.1 +MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd12.2 TARGET_ABI?= unknown -TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd12.1 +TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd12.2 KNOWN_ARCHES?= aarch64/arm64 \ amd64 \ arm \ Modified: stable/12/Makefile.libcompat ============================================================================== --- stable/12/Makefile.libcompat Thu Aug 27 23:57:30 2020 (r364896) +++ stable/12/Makefile.libcompat Fri Aug 28 00:00:37 2020 (r364897) @@ -17,7 +17,7 @@ LIB32CPUFLAGS= -march=${TARGET_CPUTYPE} .if ${WANT_COMPILER_TYPE} == gcc || \ (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc) .else -LIB32CPUFLAGS+= -target x86_64-unknown-freebsd12.1 +LIB32CPUFLAGS+= -target x86_64-unknown-freebsd12.2 .endif LIB32CPUFLAGS+= -m32 LIB32WMAKEENV= MACHINE=i386 MACHINE_ARCH=i386 \ @@ -49,9 +49,9 @@ LIB32CPUFLAGS= -march=${TARGET_CPUTYPE} .endif .else .if ${TARGET_ARCH:Mmips64el*} != "" -LIB32CPUFLAGS= -target mipsel-unknown-freebsd12.1 +LIB32CPUFLAGS= -target mipsel-unknown-freebsd12.2 .else -LIB32CPUFLAGS= -target mips-unknown-freebsd12.1 +LIB32CPUFLAGS= -target mips-unknown-freebsd12.2 .endif .endif LIB32CPUFLAGS+= -mabi=32 Modified: stable/12/lib/clang/llvm.build.mk ============================================================================== --- stable/12/lib/clang/llvm.build.mk Thu Aug 27 23:57:30 2020 (r364896) +++ stable/12/lib/clang/llvm.build.mk Fri Aug 28 00:00:37 2020 (r364897) @@ -40,7 +40,7 @@ TARGET_ABI= -gnueabi TARGET_ABI= .endif VENDOR= unknown -OS_VERSION= freebsd12.1 +OS_VERSION= freebsd12.2 LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}${TARGET_ABI} LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION} Modified: stable/12/sys/conf/newvers.sh ============================================================================== --- stable/12/sys/conf/newvers.sh Thu Aug 27 23:57:30 2020 (r364896) +++ stable/12/sys/conf/newvers.sh Fri Aug 28 00:00:37 2020 (r364897) @@ -48,8 +48,8 @@ # upper case variables starting in column 1 are on one line w/o continuation. TYPE="FreeBSD" -REVISION="12.1" -BRANCH=${BRANCH_OVERRIDE:-STABLE} +REVISION="12.2" +BRANCH=${BRANCH_OVERRIDE:-PRERELEASE} RELEASE="${REVISION}-${BRANCH}" VERSION="${TYPE} ${RELEASE}"