Remove module for kudzu.

[people/stevee/selinux-policy.git] / Makefile

diff --git a/Makefile b/Makefile
index b8486a02c5bd43fd88f1afe8e68dc263e4b033ae..bb485530bc823e217ef3cbd5f26fd7e9f9e8bb19 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,8 @@
 #
 # Please see build.conf for policy build options.
 #
+#
+VERSION = $(shell git tag 2>/dev/null | tail -n1)
 
 ########################################
 #
@@ -61,6 +63,7 @@ SEMODULE ?= $(tc_usrsbindir)/semodule
 SEMOD_PKG ?= $(tc_usrbindir)/semodule_package
 SEMOD_LNK ?= $(tc_usrbindir)/semodule_link
 SEMOD_EXP ?= $(tc_usrbindir)/semodule_expand
+SEPOLGEN ?= $(tc_usrbindir)/sepolgen-ifgen
 LOADPOLICY ?= $(tc_usrsbindir)/load_policy
 SETFILES ?= $(tc_sbindir)/setfiles
 XMLLINT ?= $(BINDIR)/xmllint
@@ -248,7 +251,7 @@ seusers := $(appconf)/seusers
 appdir := $(contextpath)
 user_default_contexts := $(wildcard config/appconfig-$(TYPE)/*_default_contexts)
 user_default_contexts_names := $(addprefix $(contextpath)/users/,$(subst _default_contexts,,$(notdir $(user_default_contexts))))
-appfiles := $(addprefix $(appdir)/,default_contexts default_type initrc_context failsafe_context userhelper_context removable_context dbus_contexts sepgsql_contexts x_contexts customizable_types securetty_types) $(contextpath)/files/media $(user_default_contexts_names)
+appfiles := $(addprefix $(appdir)/,default_contexts default_type initrc_context failsafe_context userhelper_context removable_context dbus_contexts sepgsql_contexts x_contexts customizable_types securetty_types virtual_image_context virtual_domain_context) $(contextpath)/files/media $(user_default_contexts_names)
 net_contexts := $(builddir)net_contexts
 
 all_layers := $(shell find $(wildcard $(moddir)/*) -maxdepth 0 -type d)
@@ -406,7 +409,7 @@ $(moddir)/kernel/corenetwork.if: $(moddir)/kernel/corenetwork.te.in $(moddir)/ke
        @echo "#" >> $@
        $(verbose) cat $@.in >> $@
        $(verbose) $(GREP) "^[[:blank:]]*network_(interface|node|port|packet)(_controlled)?\(.*\)" $< \
-               | $(M4) -D self_contained_policy $(M4PARAM) $@.m4 - \
+               | $(M4) -D self_contained_policy $(M4PARAM) $(m4divert) $@.m4 $(m4undivert) - \
                | $(SED) -e 's/dollarsone/\$$1/g' -e 's/dollarszero/\$$0/g' >> $@
 
 $(moddir)/kernel/corenetwork.te: $(moddir)/kernel/corenetwork.te.m4 $(moddir)/kernel/corenetwork.te.in
@@ -672,3 +675,8 @@ endif
 .PHONY: install-src install-appconfig install-headers generate xml conf html bare tags
 .SUFFIXES:
 .SUFFIXES: .c
+
+.PHONY: dist
+dist:
+       git archive --format=tar --prefix=selinux-policy-$(VERSION)/ HEAD | \
+               gzip -9 > selinux-policy-$(VERSION).tar.gz