From owner-svn-src-all@FreeBSD.ORG  Tue Oct 22 18:36:39 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 ESMTP id CDEF7F9A;
 Tue, 22 Oct 2013 18:36:39 +0000 (UTC)
 (envelope-from cperciva@FreeBSD.org)
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 BAE862E55;
 Tue, 22 Oct 2013 18:36:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9MIadmQ078366;
 Tue, 22 Oct 2013 18:36:39 GMT
 (envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9MIadrW078365;
 Tue, 22 Oct 2013 18:36:39 GMT
 (envelope-from cperciva@svn.freebsd.org)
Message-Id: <201310221836.r9MIadrW078365@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Tue, 22 Oct 2013 18:36:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256921 - head
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Oct 2013 18:36:39 -0000

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