From owner-p4-projects@FreeBSD.ORG  Wed May 24 18:33:03 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A133816A6F3; Wed, 24 May 2006 18:33:03 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 57CBD16A576
	for <perforce@FreeBSD.org>; Wed, 24 May 2006 18:33:02 +0000 (UTC)
	(envelope-from deker@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 21EC843D45
	for <perforce@FreeBSD.org>; Wed, 24 May 2006 18:33:02 +0000 (GMT)
	(envelope-from deker@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4OIWAgc044920
	for <perforce@FreeBSD.org>; Wed, 24 May 2006 18:32:10 GMT
	(envelope-from deker@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4OIW9Tx044917
	for perforce@freebsd.org; Wed, 24 May 2006 18:32:09 GMT
	(envelope-from deker@FreeBSD.org)
Date: Wed, 24 May 2006 18:32:09 GMT
Message-Id: <200605241832.k4OIW9Tx044917@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	deker@FreeBSD.org using -f
From: Rob Deker <deker@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 97761 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: Wed, 24 May 2006 18:33:07 -0000

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

Change 97761 by deker@sebsd_build on 2006/05/24 18:31:30

	Add pre-parsed policy.conf for bootstrapping and fix Makefile to support new bootstrap method.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/Makefile#17 edit
.. //depot/projects/trustedbsd/sebsd/contrib/sebsd/support/policy.conf#1 add

Differences ...

==== //depot/projects/trustedbsd/sebsd/Makefile#17 (text+ko) ====

@@ -310,8 +310,17 @@
 sebsd_bootstrap:
 .if exists(${.CURDIR}/contrib/sebsd)
 	@echo "Installing SEBSD policy"
-	(cd ${.CURDIR}/contrib/sebsd/refpolicy; gmake install-src)
-	(cd ${DESTDIR}/etc/security/sebsd/${SEBSD_POLICYTYPE}/src/policy; gmake install)
+.if exists(${DESTDIR}/usr/bin/checkpolicy)
+
+.if !exists(${DESTDIR}/etc/security/sebsd/targeted/policy/policy.20)
+	(${DESTDIR}/usr/bin/checkpolicy -o ${DESTDIR}/etc/security/sebsd/targeted/policy/policy.20 ${.CURDIR}/contrib/sebsd/support/policy.conf)
+.else
+	@echo "Binary policy file found. Not overwriting."
+.endif
+
+.else
+	@echo /usr/bin/checkpolicy not found. Did you run 'make installworld'?
+.endif
 
 .endif