>From 58b0496f82c8fbf30ef9c36f4d7b6c24578522db Mon Sep 17 00:00:00 2001 From: Nathan Kinder <nkinder@xxxxxxxxxx> Date: Tue, 22 Sep 2009 08:39:12 -0700 Subject: [PATCH] Don't build policy module from Makefile. This removes the Makefile rule that builds the SELinux policy module. The removed rule was only building and installing the module for the targeted policy. There are different base policies (targeted, strict, mls) on different systems, so it makes more sense to build the policy module from the spec file where we can define the available base policy types for the platform in question. We still need a "--with-selinux" option to enable the SELinux specific setup code as well as creating the policy .fc file with the proper paths that are defined at build time. --- Makefile.am | 12 ++-------- Makefile.in | 63 +++++++++++++++++----------------------------------------- 2 files changed, 22 insertions(+), 53 deletions(-) diff --git a/Makefile.am b/Makefile.am index f793120..b8724ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,7 +63,8 @@ LIBCRUN=@LIBCRUN@ #------------------------ # Generated Sources #------------------------ -BUILT_SOURCES = dberrstrs.h +BUILT_SOURCES = dberrstrs.h \ + $(POLICY_FC) CLEANFILES = dberrstrs.h ns-slapd.properties \ ldap/admin/src/scripts/template-dbverify ldap/admin/src/template-initconfig \ @@ -107,10 +108,6 @@ selinux-built: selinux-built/dirsrv.fc: selinux-built $(fixupcmd) selinux-built/dirsrv.fc.in > $@ -selinux-built/dirsrv.pp: selinux-built/dirsrv.fc - cd selinux-built && $(MAKE) - - #------------------------ # Install Paths @@ -128,7 +125,6 @@ instconfigdir = @instconfigdir@ perldir = $(libdir)@perldir@ infdir = $(datadir)@infdir@ mibdir = $(datadir)@mibdir@ -policydir = $(datadir)/selinux/targeted updatedir = $(datadir)@updatedir@ defaultuser=@defaultuser@ @@ -168,7 +164,7 @@ enable_presence = off endif if SELINUX -POLICY_MODULE = selinux-built/dirsrv.pp +POLICY_FC = selinux-built/dirsrv.fc endif serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la \ @@ -191,8 +187,6 @@ noinst_LIBRARIES = libavl.a libldaputil.a #------------------------ # Installed Files #------------------------ -policy_DATA = $(POLICY_MODULE) - config_DATA = $(srcdir)/lib/ldaputil/certmap.conf \ $(srcdir)/ldap/schema/slapd-collations.conf \ ldap/admin/src/template-initconfig \ diff --git a/Makefile.in b/Makefile.in index 0900553..49cde44 100644 --- a/Makefile.in +++ b/Makefile.in @@ -102,9 +102,8 @@ am__installdirs = "$(DESTDIR)$(serverdir)" \ "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" \ "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(mibdir)" \ "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" \ - "$(DESTDIR)$(policydir)" "$(DESTDIR)$(propertydir)" \ - "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)" \ - "$(DESTDIR)$(updatedir)" + "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" \ + "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(updatedir)" serverLTLIBRARIES_INSTALL = $(INSTALL) serverpluginLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES) @@ -887,15 +886,13 @@ initconfigDATA_INSTALL = $(INSTALL_DATA) mibDATA_INSTALL = $(INSTALL_DATA) nodist_propertyDATA_INSTALL = $(INSTALL_DATA) perlDATA_INSTALL = $(INSTALL_DATA) -policyDATA_INSTALL = $(INSTALL_DATA) propertyDATA_INSTALL = $(INSTALL_DATA) sampledataDATA_INSTALL = $(INSTALL_DATA) schemaDATA_INSTALL = $(INSTALL_DATA) updateDATA_INSTALL = $(INSTALL_DATA) DATA = $(config_DATA) $(inf_DATA) $(initconfig_DATA) $(mib_DATA) \ - $(nodist_property_DATA) $(perl_DATA) $(policy_DATA) \ - $(property_DATA) $(sampledata_DATA) $(schema_DATA) \ - $(update_DATA) + $(nodist_property_DATA) $(perl_DATA) $(property_DATA) \ + $(sampledata_DATA) $(schema_DATA) $(update_DATA) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -1169,7 +1166,9 @@ KERBEROS_LINK = $(kerberos_lib) #------------------------ # Generated Sources #------------------------ -BUILT_SOURCES = dberrstrs.h +BUILT_SOURCES = dberrstrs.h \ + $(POLICY_FC) + CLEANFILES = dberrstrs.h ns-slapd.properties \ ldap/admin/src/scripts/template-dbverify ldap/admin/src/template-initconfig \ ldap/admin/src/scripts/dscreate.map ldap/admin/src/scripts/remove-ds.pl \ @@ -1201,7 +1200,6 @@ CLEANFILES = dberrstrs.h ns-slapd.properties \ ldap/ldif/template-state.ldif ldap/ldif/template-suffix-db.ldif taskdir = $(datadir)@scripttemplatedir@ -policydir = $(datadir)/selinux/targeted server_LTLIBRARIES = libslapd.la libns-dshttpd.la # this is how to add optional plugins @@ -1215,7 +1213,7 @@ server_LTLIBRARIES = libslapd.la libns-dshttpd.la @enable_presence_TRUE@LIBPRESENCE_SCHEMA = $(srcdir)/ldap/schema/10presence.ldif @enable_presence_FALSE@enable_presence = off @enable_presence_TRUE@enable_presence = on -@SELINUX_TRUE@POLICY_MODULE = selinux-built/dirsrv.pp +@SELINUX_TRUE@POLICY_FC = selinux-built/dirsrv.fc serverplugin_LTLIBRARIES = libacl-plugin.la libattr-unique-plugin.la \ libback-ldbm.la libchainingdb-plugin.la libcollation-plugin.la \ libcos-plugin.la libderef-plugin.la libdes-plugin.la libdistrib-plugin.la \ @@ -1233,7 +1231,6 @@ noinst_LIBRARIES = libavl.a libldaputil.a #------------------------ # Installed Files #------------------------ -policy_DATA = $(POLICY_MODULE) config_DATA = $(srcdir)/lib/ldaputil/certmap.conf \ $(srcdir)/ldap/schema/slapd-collations.conf \ ldap/admin/src/template-initconfig \ @@ -9420,23 +9417,6 @@ uninstall-perlDATA: echo " rm -f '$(DESTDIR)$(perldir)/$$f'"; \ rm -f "$(DESTDIR)$(perldir)/$$f"; \ done -install-policyDATA: $(policy_DATA) - @$(NORMAL_INSTALL) - test -z "$(policydir)" || $(mkdir_p) "$(DESTDIR)$(policydir)" - @list='$(policy_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(policyDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(policydir)/$$f'"; \ - $(policyDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(policydir)/$$f"; \ - done - -uninstall-policyDATA: - @$(NORMAL_UNINSTALL) - @list='$(policy_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(policydir)/$$f'"; \ - rm -f "$(DESTDIR)$(policydir)/$$f"; \ - done install-propertyDATA: $(property_DATA) @$(NORMAL_INSTALL) test -z "$(propertydir)" || $(mkdir_p) "$(DESTDIR)$(propertydir)" @@ -9687,7 +9667,7 @@ check: $(BUILT_SOURCES) all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \ $(MANS) $(DATA) config.h installdirs: - for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(policydir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(updatedir)"; do \ + for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(updatedir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -9824,10 +9804,9 @@ info-am: install-data-am: install-configDATA install-infDATA \ install-initSCRIPTS install-initconfigDATA install-man \ install-mibDATA install-nodist_propertyDATA install-perlDATA \ - install-policyDATA install-propertyDATA install-sampledataDATA \ - install-schemaDATA install-serverLTLIBRARIES \ - install-serverpluginLTLIBRARIES install-taskSCRIPTS \ - install-updateDATA install-updateSCRIPTS + install-propertyDATA install-sampledataDATA install-schemaDATA \ + install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \ + install-taskSCRIPTS install-updateDATA install-updateSCRIPTS install-exec-am: install-binPROGRAMS install-binSCRIPTS \ install-sbinPROGRAMS install-sbinSCRIPTS @@ -9862,7 +9841,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ uninstall-configDATA uninstall-infDATA uninstall-info-am \ uninstall-initSCRIPTS uninstall-initconfigDATA uninstall-man \ uninstall-mibDATA uninstall-nodist_propertyDATA \ - uninstall-perlDATA uninstall-policyDATA uninstall-propertyDATA \ + uninstall-perlDATA uninstall-propertyDATA \ uninstall-sampledataDATA uninstall-sbinPROGRAMS \ uninstall-sbinSCRIPTS uninstall-schemaDATA \ uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \ @@ -9886,7 +9865,7 @@ uninstall-man: uninstall-man1 uninstall-man8 install-initSCRIPTS install-initconfigDATA install-man \ install-man1 install-man8 install-mibDATA \ install-nodist_propertyDATA install-perlDATA \ - install-policyDATA install-propertyDATA install-sampledataDATA \ + install-propertyDATA install-sampledataDATA \ install-sbinPROGRAMS install-sbinSCRIPTS install-schemaDATA \ install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \ install-strip install-taskSCRIPTS install-updateDATA \ @@ -9899,12 +9878,11 @@ uninstall-man: uninstall-man1 uninstall-man8 uninstall-initSCRIPTS uninstall-initconfigDATA uninstall-man \ uninstall-man1 uninstall-man8 uninstall-mibDATA \ uninstall-nodist_propertyDATA uninstall-perlDATA \ - uninstall-policyDATA uninstall-propertyDATA \ - uninstall-sampledataDATA uninstall-sbinPROGRAMS \ - uninstall-sbinSCRIPTS uninstall-schemaDATA \ - uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \ - uninstall-taskSCRIPTS uninstall-updateDATA \ - uninstall-updateSCRIPTS + uninstall-propertyDATA uninstall-sampledataDATA \ + uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS \ + uninstall-schemaDATA uninstall-serverLTLIBRARIES \ + uninstall-serverpluginLTLIBRARIES uninstall-taskSCRIPTS \ + uninstall-updateDATA uninstall-updateSCRIPTS clean-local: @@ -9919,9 +9897,6 @@ selinux-built: selinux-built/dirsrv.fc: selinux-built $(fixupcmd) selinux-built/dirsrv.fc.in > $@ -selinux-built/dirsrv.pp: selinux-built/dirsrv.fc - cd selinux-built && $(MAKE) - #------------------------ # ns-slapd.properties #------------------------ -- 1.6.2.5
-- 389-devel mailing list 389-devel@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-directory-devel
