From owner-p4-projects@FreeBSD.ORG  Wed May 17 19:05:21 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 B2EBF16B0DC; Wed, 17 May 2006 19:05:21 +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 6F07F16A60D
	for <perforce@FreeBSD.org>; Wed, 17 May 2006 19:05:21 +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 9580943D55
	for <perforce@FreeBSD.org>; Wed, 17 May 2006 19:05:20 +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 k4HJ4xnQ044571
	for <perforce@FreeBSD.org>; Wed, 17 May 2006 19:04:59 GMT
	(envelope-from deker@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4HJ4x71044568
	for perforce@freebsd.org; Wed, 17 May 2006 19:04:59 GMT
	(envelope-from deker@FreeBSD.org)
Date: Wed, 17 May 2006 19:04:59 GMT
Message-Id: <200605171904.k4HJ4x71044568@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 97365 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, 17 May 2006 19:05:22 -0000

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

Change 97365 by deker@sebsd_build on 2006/05/17 19:04:31

	Delete hackish loader.conf update.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/Makefile#15 edit
.. //depot/projects/trustedbsd/sebsd/contrib/sebsd/support/loader.conf.additions#2 delete

Differences ...

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

@@ -306,18 +306,11 @@
 .endif
 
 # Bootstrapping of SEBSD-specific bits
-SEBSD_BOOTSTRAP_CHECK!= grep sebsd_bootstrap /boot/loader.conf
-SEBSD_POLICYTYPE!= grep "TYPE" ${.CURDIR}/contrib/sebsd/refpolicy/build.conf | cut -d" " -f3
 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 empty (BOOTSTRAP_CHECK)
-	@echo "Making modifications to /boot/loader.conf"
-	(cat ${.CURDIR}/contrib/sebsd/support/loader.conf.additions | sed s/\#SEBSD_POLICYTYPE\#/${SEBSD_POLICYTYPE}/ >> /boot/loader.conf)
-.endif
-
 
 .endif