From owner-trustedbsd-cvs@FreeBSD.ORG Wed Oct 25 19:24:16 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7D66816A412 for ; Wed, 25 Oct 2006 19:24:16 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4EA743D46 for ; Wed, 25 Oct 2006 19:24:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5EB6746E6E for ; Wed, 25 Oct 2006 15:24:13 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id AF8CC5B643; Wed, 25 Oct 2006 19:18:01 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id A8C7816A47E; Wed, 25 Oct 2006 19:18:01 +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 8489D16A47B for ; Wed, 25 Oct 2006 19:18:01 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51FFD43D46 for ; Wed, 25 Oct 2006 19:18:01 +0000 (GMT) (envelope-from millert@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 k9PJI1sS056510 for ; Wed, 25 Oct 2006 19:18:01 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9PJI1LS056505 for perforce@freebsd.org; Wed, 25 Oct 2006 19:18:01 GMT (envelope-from millert@freebsd.org) Date: Wed, 25 Oct 2006 19:18:01 GMT Message-Id: <200610251918.k9PJI1LS056505@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 108413 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Oct 2006 19:24:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=108413 Change 108413 by millert@millert_macbook on 2006/10/25 19:17:23 When building policy in /etc/sedarwin/refpolicy, use the pre-generated .flask files. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/Makefile#4 (text+ko) ==== @@ -78,7 +78,7 @@ SEMOD_EXP ?= $(BINDIR)/semodule_expand LOADPOLICY ?= $(SBINDIR)/load_policy SETFILES ?= $(BINDIR)/setfiles -MIG ?= $(BINDIR)/mig +MIG_DEFS ?= bootstrap.flask notify_ipc.flask mtest.flask endif XMLLINT ?= $(BINDIR)/xmllint @@ -628,7 +628,11 @@ $(mig_msgids): $(MIG_DEFS) echo > $@ +ifeq ($(SEDARWIN_BUILD),1) for i in $(MIG_DEFS); do $(MIG) -user /dev/null -server /dev/null -header /dev/null -sheader /dev/null -flasksc `basename $$i .defs`.flask $$i; cat `basename $$i .defs`.flask >> $@; done +else + cat $(MIG_DEFS) >> $@ +endif $(mig_avs): $(mig_msgids) cat $< | awk '{sub("^_*", "", $$1); print $$1, $$2}' > $@