Date: Tue, 22 Aug 2006 10:59:33 GMT From: dongmei <dongmei@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 104765 for review Message-ID: <200608221059.k7MAxXpQ034567@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608221059.k7MAxXpQ034567>