Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 May 2004 10:40:30 -0700 (PDT)
From:      Chris Vance <cvance@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 52150 for review
Message-ID:  <200405031740.i43HeU2n078333@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=52150

Change 52150 by cvance@cvance_g5 on 2004/05/03 10:39:59

	Refine build just a bit more.  
	Rename export to "release"
	Really hook the policy build back into the makefiles.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin73/Makeconfig#3 edit
.. //depot/projects/trustedbsd/sedarwin73/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin73/export/Makefile#3 delete
.. //depot/projects/trustedbsd/sedarwin73/policy/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin73/release/Makefile#1 add

Differences ...

==== //depot/projects/trustedbsd/sedarwin73/Makeconfig#3 (text+ko) ====

@@ -4,7 +4,7 @@
 # Set the following variable to the installation directory
 # or leave blank for "/"
 #DESTDIR =
-DESTDIR = $(SEDARWIN_ROOT)/export/root
+DESTDIR = $(SEDARWIN_ROOT)/export
 
 # if you aren't going to install as root, you need to set the
 # user for 

==== //depot/projects/trustedbsd/sedarwin73/Makefile#3 (text+ko) ====

@@ -1,7 +1,7 @@
 include Makeconfig
 
-SUBDIR= apsl \
-	export \
+SUBDIR= release \
+	apsl \
 	libextattr \
 	libmac \
 	libsebsd \
@@ -17,6 +17,6 @@
 #	sebsd_system
 
 distclean:
-	cd export && $(MAKE) distclean
+	cd release && $(MAKE) distclean
 
 .include <bsd.subdir.mk>

==== //depot/projects/trustedbsd/sedarwin73/policy/Makefile#3 (text+ko) ====

@@ -12,7 +12,7 @@
 	cat $(INPUTS) > policy.conf
 
 $(POLICY): policy.conf
-	$(DESTDIR)/$(BINDIR)/checkpolicy -o $(POLICY) policy.conf
+	../sebsd_cmds/checkpolicy/checkpolicy -o $(POLICY) policy.conf
 
 rules.m4: rules
 	m4 -Imacros -s rules > rules.m4
@@ -28,7 +28,7 @@
 	    genfs
 
 relabel: fc
-	$(DESTDIR)/$(BINDIR)/setfsmac -s fc /
+	@echo This is broken
 
 install:
 	$(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 ${POLICY} ${POLICYDIR}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200405031740.i43HeU2n078333>