Changeset 183

Timestamp:

04/11/08 09:30:06 (8 months ago)

Author:

slawrence

Message:

- Add packages needed to build policy to the kickstart file
- Modify makefile and specfiles to allow building a modular policy

Files:

• trunk/RHEL5.1/kickstart/clip.ks (modified) (2 diffs)
• trunk/RHEL5.1/refpolicy/build/Makefile (modified) (2 diffs)
• trunk/RHEL5.1/refpolicy/conf/selinux-policy-modular.spec (added)
• trunk/RHEL5.1/refpolicy/conf/selinux-policy-monolithic.spec (added)
• trunk/RHEL5.1/refpolicy/conf/selinux-policy.spec (deleted)
• trunk/RHEL5.1/refpolicy/src/selinux-policy-clip/Rules.modular (modified) (4 diffs)

trunk/RHEL5.1/kickstart/clip.ks

@@ -116 +116 @@
-logvol /var --fstype ext3 --name=varVol --vgname=VolGroup00 --size=1024 --grow
-logvol /home --fstype ext3 --name=homeVol --vgname=VolGroup00 --size=256 --grow
- --grow
+
-
-
@@ -271 +271 @@
--rsh
-
+# needed to compile policy on RHEL5.1
+rpm-build
+gcc
+checkpolicy
+
-%pre
-

trunk/RHEL5.1/refpolicy/build/Makefile

@@ -57 +57 @@
-CONF_DIR := $(ROOT_DIR)/conf
-SUPPORT_DIR := $(ROOT_DIR)/support
-POLICY_SPEC := $(CONF_DIR)/selinux-policy.spec
-
-RPM_TMPDIR := $(ROOT_DIR)/tmp
@@ -66 +65 @@
-POL_TYPE := $(shell grep "^TYPE = " $(POLICY_DIR)/build.conf |awk ' { print $$3 } ')
-OUTPUT_VER := $(shell grep "^OUTPUT_POLICY = " $(POLICY_DIR)/build.conf |awk ' { print $$3 } ')
+MONOLITHIC := $(shell grep "^MONOLITHIC" $(POLICY_DIR)/build.conf | grep -c "y" )
+
+ifeq ($(MONOLITHIC),1)
+  POLICY_SPEC := $(CONF_DIR)/selinux-policy-monolithic.spec
+else
+  POLICY_SPEC := $(CONF_DIR)/selinux-policy-modular.spec
+endif
-
-ifeq ($(OUTPUT_VER),)

trunk/RHEL5.1/refpolicy/src/selinux-policy-clip/Rules.modular

@@ -3 +3 @@
-# Rules and Targets for building modular policies
-#
+
+appfiles += $(installdir)/booleans $(userpath)/local.users $(installdir)/seusers
-
-all_modules := $(base_mods) $(mod_mods) $(off_mods)
@@ -92 +94 @@
-# Create a base module package
-#
-
+ $(net_contexts)
-        @echo "Creating $(NAME) base module package"
-        @test -d $(builddir) || mkdir -p $(builddir)
-
+ -n $(net_contexts)
-
-ifneq "$(UNK_PERMS)" ""
@@ -205 +207 @@
-########################################
-#
+# Intall netfilter_contexts
+#
+$(ncpath): $(net_contexts)
+        @echo "Installing $(NAME) netfilter_contexts."
+        $(verbose) $(INSTALL) -m 0644 $^ $@
+
+########################################
+#
-# Appconfig files
-#
@@ -211 +221 @@
-        $(verbose) $(GREP) '^[[:blank:]]*type .*customizable' $< | cut -d';' -f1 | cut -d',' -f1 | cut -d' ' -f2 | $(SORT) -u > $(tmpdir)/customizable_types
-        $(verbose) $(INSTALL) -m 644 $(tmpdir)/customizable_types $@ 
+
+$(installdir)/seusers: $(seusers)
+        @mkdir -p $(tmpdir)
+        $(verbose) $(M4) $(M4PARAM) $(m4support) $^ | $(GREP) '^[a-z_]' > $(tmpdir)/seusers
+        $(verbose) $(INSTALL) -m 644 $(tmpdir)/seusers $(installdir)/seusers
-
-########################################