Changeset 2238

Timestamp:

06/13/08 09:59:52 (4 months ago)

Author:

dsugar

Message:

updated make/spec files to match current CLIP

Files:

• trunk/framework-plugin/resources/build/Makefile (modified) (6 diffs)
• trunk/framework-plugin/resources/conf/selinux-policy-modular.spec (added)
• trunk/framework-plugin/resources/conf/selinux-policy-monolithic.spec (moved) (moved from trunk/framework-plugin/resources/conf/selinux-policy.spec) (5 diffs)

trunk/framework-plugin/resources/build/Makefile

@@ -4 +4 @@
-#      published by the Free Software Foundation, version 2.
-#
-
+
+
-#
-# README: This build systems creates a refpolicy based policy RPM.  The repo 
@@ -18 +19 @@
-
-# The name of the policy eg in the case of selinux-policy-ftg it would be ftg
-ds-baseline
+lip
-
-# This is the version number of the RPM that will be 
-# generated.  Typically you bump this for delivery.
-1
+2
-
-# bump this if creating multiple releases from the same 
-# version (think about this... why are you doing this?)
-
+
+
+
+
+
+
+
-
-# change this to "y" to build a src rpm
@@ -35 +42 @@
-MODE ?= permissive
-
-# This is Vendor creating the package, it defaults to Tresys Technology, LLC
-VENDOR ?= "Tresys Technology, LLC"
-
-# This is the Package responsible for generating this pakcage, it defaults to
-# Treys Technology, LLC
-PACKAGER ?= "Tresys Technology, LLC" 
-
-# please insert any docs here that you want to be placed in the tarball
@@ -57 +58 @@
-CONF_DIR := $(ROOT_DIR)/conf
-SUPPORT_DIR := $(ROOT_DIR)/support
-POLICY_SPEC := $(CONF_DIR)/selinux-policy.spec
-
-RPM_TMPDIR := $(ROOT_DIR)/tmp
@@ -66 +66 @@
-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),)
@@ -118 +125 @@
-                --define 'release $(RELEASE)' --define 'type $(POL_TYPE)' \
-                --define 'output_version $(OUTPUT_VER)' \
-                --define 'packager $(PACKAGER)' \
-                --define 'vendor $(VENDOR)' \
-                --define 'mode $(MODE)' --define 'polname $(POLNAME)' \
+                --define 'vendor $(VENDOR)' --define 'packager $(PACKAGER)' \
-                -b$(BIN_OR_ALL) SPECS/$(notdir $(POLICY_SPEC))
-        mv  $(RPM_BUILDROOT)/RPMS/noarch/selinux-policy-$(POLNAME)-$(VERSION)-$(RELEASE).noarch.rpm $(OUTPUT_DIR)

trunk/framework-plugin/resources/conf/selinux-policy-monolithic.spec

@@ -1 @@
-# This is the spec file for a Tresys refpolicy based guard
-%define POLICYDIR /etc/selinux/%{polname}
-%define FILE_CONTEXT %{POLICYDIR}/contexts/files/file_contexts
@@ -7 +6 @@
-Version: %{version}
-Release: %{release}
-Proprietary
+GPL
-Vendor: %{vendor}
-Packager: %{packager}
@@ -45 +44 @@
-make NAME=%{polname} DESTDIR=$RPM_BUILD_ROOT $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%{polname}/users/local.users
-make NAME=%{polname} DESTDIR=$RPM_BUILD_ROOT $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%{polname}/users/system.users
+make NAME=%{polname} DESTDIR=$RPM_BUILD_ROOT $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%{polname}/contexts/netfilter_contexts
-make NAME=%{polname} DESTDIR=$RPM_BUILD_ROOT install
-
@@ -70 +70 @@
-%config(noreplace) %{_sysconfdir}/selinux/%{polname}/contexts/removable_context
-%config(noreplace) %{_sysconfdir}/selinux/%{polname}/contexts/userhelper_context
+%{_sysconfdir}/selinux/%{polname}/seusers
-%{_sysconfdir}/selinux/%{polname}/contexts/files
-%{_sysconfdir}/selinux/%{polname}/contexts/netfilter_contexts
+%config %{_sysconfdir}/selinux/%{polname}/contexts/users/*
-%dir %{_sysconfdir}/selinux/*/users
-%config %{_sysconfdir}/selinux/%{polname}/users/system.users
@@ -88 +90 @@
-#echo "Do to configuration differences the system will be set to permissive mode.  The system will then be relabeled and then it MUST be rebooted.  DO NOT RUN THE SYSTEM WITHOUT REBOOTING!  Press enter to continue."
-#read
-#
+
-
-if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled && [ -e /selinux/policyvers ]; then
-        [ -x /usr/sbin/load_policy ] && /usr/sbin/load_policy 
-usr/sbin/setfiles ] && /usr
+sbin/setfiles ] && 
-fi
-echo "" > /etc/selinux/%{polname}/booleans