From owner-svn-src-stable@FreeBSD.ORG  Fri Dec 27 17:32:48 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D4E2BCB5;
 Fri, 27 Dec 2013 17:32:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C01361149;
 Fri, 27 Dec 2013 17:32:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRHWmNc039168;
 Fri, 27 Dec 2013 17:32:48 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRHWmg0039167;
 Fri, 27 Dec 2013 17:32:48 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201312271732.rBRHWmg0039167@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 27 Dec 2013 17:32:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r259954 - stable/9/release
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Dec 2013 17:32:48 -0000

Author: gjb
Date: Fri Dec 27 17:32:48 2013
New Revision: 259954
URL: http://svnweb.freebsd.org/changeset/base/259954

Log:
  MFC r254298:
    Remove get_rev_branch(), functionality exists in the release/Makefile.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/9/release/release.sh
Directory Properties:
  stable/9/release/   (props changed)

Modified: stable/9/release/release.sh
==============================================================================
--- stable/9/release/release.sh	Fri Dec 27 17:09:59 2013	(r259953)
+++ stable/9/release/release.sh	Fri Dec 27 17:32:48 2013	(r259954)
@@ -81,17 +81,6 @@ NOPORTS=
 # Set to non-empty value to build dvd1.iso as part of the release.
 WITH_DVD=
 
-get_rev_branch () {
-	# Set up the OSVERSION, BRANCH, and REVISION based on the src/ tree
-	# checked out.
-	OSVERSION=$(grep '#define __FreeBSD_version' ${CHROOTDIR}/usr/src/sys/sys/param.h | awk '{print $3}')
-	BRANCH=$(grep '^BRANCH=' ${CHROOTDIR}/usr/src/sys/conf/newvers.sh \
-		| awk -F\= '{print $2}' | sed -e 's,",,g')
-	REVISION=$(grep '^REVISION=' ${CHROOTDIR}/usr/src/sys/conf/newvers.sh \
-		| awk -F\= '{print $2}' | sed -e 's,",,g')
-	OSRELEASE="${REVISION}-${BRANCH}"
-}
-
 usage() {
 	echo "Usage: $0 [-c release.conf]"
 	exit 1
@@ -175,8 +164,6 @@ if [ "x${NOPORTS}" = "x" ]; then
 	svn co ${SVNROOT}/${PORTBRANCH} ${CHROOTDIR}/usr/ports $PORTREVISION
 fi
 
-get_rev_branch
-
 cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf
 cd ${CHROOTDIR}/usr/src
 make ${CHROOT_WMAKEFLAGS} buildworld