From owner-p4-projects@FreeBSD.ORG  Tue Aug 22 10:59:36 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 5936616A4E0; Tue, 22 Aug 2006 10:59:36 +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 332F716A4E6
	for <perforce@FreeBSD.org>; Tue, 22 Aug 2006 10:59:36 +0000 (UTC)
	(envelope-from dongmei@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F084A43D5D
	for <perforce@FreeBSD.org>; Tue, 22 Aug 2006 10:59:33 +0000 (GMT)
	(envelope-from dongmei@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 k7MAxXh6034570
	for <perforce@FreeBSD.org>; Tue, 22 Aug 2006 10:59:33 GMT
	(envelope-from dongmei@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7MAxXpQ034567
	for perforce@freebsd.org; Tue, 22 Aug 2006 10:59:33 GMT
	(envelope-from dongmei@FreeBSD.org)
Date: Tue, 22 Aug 2006 10:59:33 GMT
Message-Id: <200608221059.k7MAxXpQ034567@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	dongmei@FreeBSD.org using -f
From: dongmei <dongmei@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 104765 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: Tue, 22 Aug 2006 10:59:36 -0000

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

Change 104765 by dongmei@soc-dongmei-sebsd on 2006/08/22 10:58:37

	Correct a part of booting error, as the swapon, fsck and hostname. 

Affected files ...

.. //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/refpolicy/Makefile#3 edit
.. //depot/projects/soc2006/dongmei_sebsd/lib/libsefs/Makefile#1 add

Differences ...

==== //depot/projects/soc2006/dongmei_sebsd/contrib/sebsd/refpolicy/Makefile#3 (text+ko) ====

@@ -26,7 +26,6 @@
 # Include the local build.conf if it exists, otherwise
 # include the configuration of the root directory.
 include build.conf
-
 ifdef LOCAL_ROOT
 	-include $(LOCAL_ROOT)/build.conf
 endif
@@ -71,7 +70,14 @@
 FLASKDIR := $(POLDIR)/flask
 SECCLASS := $(FLASKDIR)/security_classes
 ISIDS := $(FLASKDIR)/initial_sids
-AVS := $(FLASKDIR)/access_vectors
+ifeq ($(DISTRO),sebsd)
+	AVS := $(FLASKDIR)/access_vectors.sebsd
+	SECCLASS := $(FLASKDIR)/security_classes.sebsd
+else
+	AVS := $(FLASKDIR)/access_vectors
+	SECCLASS := $(FLASKDIR)/security_classes
+endif
+	
 
 # local source layout
 ifdef LOCAL_ROOT
@@ -409,8 +415,12 @@
 #
 # Appconfig files
 #
+APPCONF := config/appconfig-$(TYPE)
+
 install-appconfig: $(APPFILES)
-
+test1:
+	echo $(APPCONF)
+	echo $(APPDIR)
 $(INSTALLDIR)/booleans: $(BOOLEANS)
 	@mkdir -p $(TMPDIR)
 	@mkdir -p $(INSTALLDIR)
@@ -557,6 +567,11 @@
 	fi
 	$(verbose) $(SETFILES) -F $(FCPATH) $(FILESYSTEMS)
 
+test:
+	echo $(APPCONF)
+	echo $(APPDIR)
+	echo $(CONTEXTPATH)
+	echo $(M4PARAM)
 ########################################
 #
 # Clean everything
@@ -569,6 +584,7 @@
 	rm -f $(BOOLEANS)
 	rm -fR $(HTMLDIR)
 	rm -f $(TAGS)
+
 # don't remove these files if we're given a local root
 ifndef LOCAL_ROOT
 	rm -f $(FCSORT)
@@ -583,7 +599,6 @@
 	rm -f $(GENERATED_FC)
 endif
 endif
-
 .PHONY: install-src install-appconfig generate xml conf html bare tags
 .SUFFIXES:
 .SUFFIXES: .c