Date: Tue, 13 Aug 2013 21:01:24 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r254298 - head/release Message-ID: <201308132101.r7DL1OnR092466@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Tue Aug 13 21:01:23 2013 New Revision: 254298 URL: http://svnweb.freebsd.org/changeset/base/254298 Log: Remove get_rev_branch(), functionality exists in the release/Makefile. Submitted by: hrs Modified: head/release/release.sh Modified: head/release/release.sh ============================================================================== --- head/release/release.sh Tue Aug 13 20:38:55 2013 (r254297) +++ head/release/release.sh Tue Aug 13 21:01:23 2013 (r254298) @@ -73,17 +73,6 @@ NODOC= NOPORTS= MAKE_FLAGS="${MAKE_FLAGS}" -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 @@ -171,8 +160,6 @@ if [ "x${NOPORTS}" = "x" ]; then svn co ${SVNROOT}/${PORTBRANCH} ${CHROOTDIR}/usr/ports fi -get_rev_branch - cd ${CHROOTDIR}/usr/src make ${CHROOT_WMAKEFLAGS} buildworld make ${CHROOT_IMAKEFLAGS} installworld DESTDIR=${CHROOTDIR}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308132101.r7DL1OnR092466>