Date: Tue, 22 Oct 2013 23:37:55 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r256947 - stable/10 Message-ID: <201310222337.r9MNbtra003762@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Tue Oct 22 23:37:54 2013 New Revision: 256947 URL: http://svnweb.freebsd.org/changeset/base/256947 Log: Revert r256944, which does not quite get the src/ directory correct. Discussed with: cperciva Approved by: re (implicit) Pointyhat: gjb Modified: stable/10/Makefile.inc1 (contents, props changed) Modified: stable/10/Makefile.inc1 ============================================================================== --- stable/10/Makefile.inc1 Tue Oct 22 22:17:48 2013 (r256946) +++ stable/10/Makefile.inc1 Tue Oct 22 23:37:54 2013 (r256947) @@ -128,11 +128,8 @@ OSRELDATE= 0 .endif .if !defined(VERSION) -REVISION!= make -C ${.CURDIR}/release -V REVISION -BRANCH!= make -C ${.CURDIR}/release -V BRANCH -SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ - ${.CURDIR}/sys/sys/param.h -VERSION= FreeBSD ${REVISION}-${BRANCH} ${TARGET_ARCH} ${SRCRELDATE} +VERSION!= uname -srp +VERSION+= ${OSRELDATE} .endif KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310222337.r9MNbtra003762>