Date: Tue, 3 May 2005 22:02:10 GMT From: Scott Long <scottl@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 76466 for review Message-ID: <200505032202.j43M2AEq084758@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=76466 Change 76466 by scottl@scottl-x64 on 2005/05/03 22:02:01 Add some plumbing to allow compatibility policy versions to be used. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#19 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#19 (text+ko) ==== @@ -14,13 +14,19 @@ # Set to y if MLS is enabled in the module. MLS= n +POLICYVERCOMPAT = 17 FLASKDIR = flask/ PREFIX = /usr LOADPOLICY = $(DESTDIR)/sbin/sebsd_loadpolicy CHECKPOLICY = $(DESTDIR)/sbin/sebsd_checkpolicy SETFILES = $(DESTDIR)/sbin/sebsd_setfiles -POLICYVERTMP = 17 +.if (POLICYVERCOMPAT) +POLICYVERTMP = $(POLICYVERCOMPAT) +POLICYVERCOMPATARGS = -c $(POLICYVERCOMPAT) +.else +POLICYVERTMP != ($(CHECKPOLICY) $(POLICYCOMPAT) -V |cut -f 1 -d ' ') +.endif POLICYVER := policy.$(POLICYVERTMP) INSTALLDIR = $(DESTDIR)/etc/security/sebsd POLICYPATH = $(INSTALLDIR)/policy @@ -97,14 +103,14 @@ $(LOADPATH): policy.conf $(CHECKPOLICY) mkdir -p $(POLICYPATH) - $(CHECKPOLICY) -o $@ policy.conf + $(CHECKPOLICY) $(POLICYVERCOMPATARGS) -o $@ policy.conf # Note: Can't use install, so not sure how to deal with mode, user, and group # other than by default. policy: $(POLICYVER) $(POLICYVER): policy.conf $(CHECKPOLICY) - $(CHECKPOLICY) -o $@ policy.conf + $(CHECKPOLICY) $(POLICYVERCOMPATARGS) -o $@ policy.conf reload tmp/load: $(LOADPATH) $(FCPATH) $(LOADPOLICY) $(POLICYPATH)/$(POLICYVER)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505032202.j43M2AEq084758>