From owner-p4-projects@FreeBSD.ORG  Sat Jan 30 21:34:36 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 478DC1065679; Sat, 30 Jan 2010 21:34:36 +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 0C1311065672
	for <perforce@freebsd.org>; Sat, 30 Jan 2010 21:34:36 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id ED9828FC12
	for <perforce@freebsd.org>; Sat, 30 Jan 2010 21:34:35 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0ULYZuP022558
	for <perforce@freebsd.org>; Sat, 30 Jan 2010 21:34:35 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0ULYZXU022556
	for perforce@freebsd.org; Sat, 30 Jan 2010 21:34:35 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 30 Jan 2010 21:34:35 GMT
Message-Id: <201001302134.o0ULYZXU022556@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 173971 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 30 Jan 2010 21:34:36 -0000

http://p4web.freebsd.org/chv.cgi?CH=173971

Change 173971 by rwatson@rwatson_vimage_client on 2010/01/30 21:34:01

	For sample CAPABILITIES configuration files, set the kernel ident, and
	synchronize between amd64/i386 options.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/CAPABILITIES#3 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/CAPABILITIES#4 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/conf/CAPABILITIES#3 (text+ko) ====

@@ -1,4 +1,5 @@
 include GENERIC
+ident CAPABILITIES
 
 options CAPABILITIES
 options PROCDESC
@@ -6,4 +7,3 @@
 options WITNESS
 options KDB
 options DDB
-

==== //depot/projects/trustedbsd/capabilities/src/sys/i386/conf/CAPABILITIES#4 (text+ko) ====

@@ -1,4 +1,9 @@
 include GENERIC
+ident CAPABILITIES
+
 options CAPABILITIES
 options PROCDESC
 options KDTRACE_HOOKS
+options WITNESS
+options KDB
+options DDB