Date: Tue, 3 May 2005 17:51:58 GMT From: Andrew Reisse <areisse@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 76446 for review Message-ID: <200505031751.j43Hpwwt063676@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505031751.j43Hpwwt063676>