From owner-p4-projects@FreeBSD.ORG  Thu Jan  3 20:29:35 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AA1D216A46E; Thu,  3 Jan 2008 20:29:35 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6E28216A46B
	for <perforce@freebsd.org>; Thu,  3 Jan 2008 20:29:35 +0000 (UTC)
	(envelope-from evilpete@gmail.com)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5F34613C442
	for <perforce@freebsd.org>; Thu,  3 Jan 2008 20:29:35 +0000 (UTC)
	(envelope-from evilpete@gmail.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m03KTZlj004095
	for <perforce@freebsd.org>; Thu, 3 Jan 2008 20:29:35 GMT
	(envelope-from evilpete@gmail.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m03KTZ3g004092
	for perforce@freebsd.org; Thu, 3 Jan 2008 20:29:35 GMT
	(envelope-from evilpete@gmail.com)
Date: Thu, 3 Jan 2008 20:29:35 GMT
Message-Id: <200801032029.m03KTZ3g004092@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	evilpete@gmail.com using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 132422 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Jan 2008 20:29:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=132422

Change 132422 by peter@peter_daintree on 2008/01/03 20:28:47

	DOH! don't reuse $u for uuid.

Affected files ...

.. //depot/projects/hammer/sys/conf/newvers.sh#20 edit

Differences ...

==== //depot/projects/hammer/sys/conf/newvers.sh#20 (text+ko) ====

@@ -86,7 +86,7 @@
 touch version
 v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date`
 i=`${MAKE:-make} -V KERN_IDENT`
-u=`uuidgen`
+uuid=`uuidgen`
 cat << EOF > vers.c
 $COPYRIGHT
 #define SCCSSTR "@(#)${VERSION} #${v}: ${t}"
@@ -99,7 +99,7 @@
 char osrelease[sizeof(RELSTR) > 32 ? sizeof(RELSTR) : 32] = RELSTR;
 int osreldate = ${RELDATE};
 char kern_ident[] = "${i}";
-char build_uuid[] = "${u}";
+char build_uuid[] = "${uuid}";
 EOF
 
 echo `expr ${v} + 1` > version