From owner-p4-projects@FreeBSD.ORG  Tue May  3 17:52:03 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E517916A4D0; Tue,  3 May 2005 17:52:02 +0000 (GMT)
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 791B816A4CE
	for <perforce@freebsd.org>; Tue,  3 May 2005 17:52:02 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5035943D46
	for <perforce@freebsd.org>; Tue,  3 May 2005 17:52:02 +0000 (GMT)
	(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j43HpwZb063679
	for <perforce@freebsd.org>; Tue, 3 May 2005 17:51:58 GMT
	(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j43Hpwwt063676
	for perforce@freebsd.org; Tue, 3 May 2005 17:51:58 GMT
	(envelope-from areisse@nailabs.com)
Date: Tue, 3 May 2005 17:51:58 GMT
Message-Id: <200505031751.j43Hpwwt063676@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 76446 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Tue, 03 May 2005 17:52:03 -0000

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

Change 76446 by areisse@areisse_tislabs on 2005/05/03 17:51:02

	Fix some problems with the sebsd policy makefile:
	-Don't require genhomedircon to be executable, it's a shell script
	-Make the default target just build the policy, not install it.
	-Use policy version 17, as the netlink classes are unused.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#18 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#18 (text+ko) ====

@@ -9,7 +9,7 @@
 # relabel - relabel filesystems based on the file contexts configuration.
 # policy  - compile the policy configuration locally for testing/development.
 #
-# The default target is 'install'.
+# The default target builds the policy and file_contexts, but doesn't install.
 #
 
 # Set to y if MLS is enabled in the module.
@@ -20,7 +20,7 @@
 LOADPOLICY  = $(DESTDIR)/sbin/sebsd_loadpolicy
 CHECKPOLICY = $(DESTDIR)/sbin/sebsd_checkpolicy
 SETFILES = $(DESTDIR)/sbin/sebsd_setfiles
-POLICYVERTMP != ($(CHECKPOLICY) $(POLICYCOMPAT) -V |cut -f 1 -d ' ')
+POLICYVERTMP = 17
 POLICYVER := policy.$(POLICYVERTMP)
 INSTALLDIR = $(DESTDIR)/etc/security/sebsd
 POLICYPATH = $(INSTALLDIR)/policy
@@ -66,6 +66,8 @@
 APPFILES = $(APPDIR)/default_contexts $(APPDIR)/default_type $(APPDIR)/initrc_context # $(APPDIR)/userhelper_context $(APPDIR)/failsafe_context
 ROOTFILES = # $(APPDIR)/users/root
 
+default: $(POLICYVER) $(FC)
+
 install: $(APPFILES) $(ROOTFILES) $(LOADPATH) $(FCPATH) 
 
 $(APPDIR)/default_contexts: appconfig/default_contexts
@@ -152,7 +154,7 @@
 	@echo "Building file_contexts ..."
 	@m4 $(ALL_TUNABLES) $(FCFILES) > $@.tmp
 	@grep -v "^/root" $@.tmp > $@.root
-	./genhomedircon $@.root  > $@
+	@sh ./genhomedircon $@.root  > $@
 	@grep "^/root" $@.tmp >> $@
 	@-rm $@.tmp $@.root