svn commit: r256921 - head

[Colin Percival]

Author: cperciva
Date: Tue Oct 22 18:36:39 2013
New Revision: 256921
URL: http://svnweb.freebsd.org/changeset/base/256921

Log:
  Thou shalt not leak build host state into the system being compiled.
  
  The VERSION variable is encoded into the SUNW_ctf sections of the kernel
  and every kernel module when dtrace is enabled; starting with 9.2-RELEASE
  (when dtrace was turned on in GENERIC) this means that different host kernels
  will result in very different kernel binaries being generated.  This tripped
  up freebsd-update builds after the build boxes were updated from 9.x to 10.x.
  
  MFC after:	3 days (stable/9)
  X-MFC after:	0 days (stable/10)
  Security:	Rendered two members of so@ temporarily insane

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Oct 22 18:24:34 2013	(r256920)
+++ head/Makefile.inc1	Tue Oct 22 18:36:39 2013	(r256921)
@@ -128,8 +128,11 @@ OSRELDATE=	0
 .endif
 
 .if !defined(VERSION)
-VERSION!=	uname -srp
-VERSION+=	${OSRELDATE}
+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}
 .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