svn commit: r259954 - stable/9/release

[Glen Barber]

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