diff options
| author | Robert Haas | 2011-02-17 11:39:13 +0000 |
|---|---|---|
| committer | Robert Haas | 2011-02-17 11:40:32 +0000 |
| commit | 24bc6b3db3579f4c480c6d0f81f7e50f1e6c0180 (patch) | |
| tree | 6841ae591234d662e5165db8a2e6a7019c3c91b6 | |
| parent | 93016983d1e8f3aeb508f1be8daf5ca5de5c5b61 (diff) | |
Remove rule to build sepgsql-regtest.pp.
Instead, document how to build it manually.
Per discussion. KaiGai Kohei, with some wordsmithing by me.
| -rw-r--r-- | contrib/sepgsql/Makefile | 5 | ||||
| -rw-r--r-- | doc/src/sgml/sepgsql.sgml | 15 |
2 files changed, 11 insertions, 9 deletions
diff --git a/contrib/sepgsql/Makefile b/contrib/sepgsql/Makefile index 37a6dce89d8..bc995dd29a2 100644 --- a/contrib/sepgsql/Makefile +++ b/contrib/sepgsql/Makefile @@ -3,7 +3,7 @@ MODULE_big = sepgsql OBJS = hooks.o selinux.o label.o dml.o \ schema.o relation.o proc.o -DATA_built = sepgsql.sql sepgsql-regtest.pp +DATA_built = sepgsql.sql REGRESS = label dml misc EXTRA_CLEAN = -r tmp *.pp sepgsql-regtest.if sepgsql-regtest.fc @@ -20,6 +20,3 @@ endif SHLIB_LINK += $(filter -lselinux, $(LIBS)) REGRESS_OPTS += --launcher $(top_builddir)/contrib/sepgsql/launcher - -sepgsql-regtest.pp: sepgsql-regtest.te - $(MAKE) -f $(DESTDIR)/usr/share/selinux/devel/Makefile $@ diff --git a/doc/src/sgml/sepgsql.sgml b/doc/src/sgml/sepgsql.sgml index 9ef2bf9da82..d24cc056d25 100644 --- a/doc/src/sgml/sepgsql.sgml +++ b/doc/src/sgml/sepgsql.sgml @@ -124,19 +124,24 @@ $ for DBNAME in template0 template1 postgres; do </para> <para> - First, install the policy package for the regression test. + First, build and install the policy package for the regression test. The <filename>sepgsql-regtest.pp</> is a special purpose policy package which provides a set of rules to be allowed during the regression tests. - You need to install this policy package using the <command>semodule</> - command, which links supplied policy packages and loads them - into the kernel space. If this packages is correctly installed, + It should be built from the policy source fire + (<filename>sepgsql-regtest.te</>), which is normally done using + <command>make</command>. You will need to locate the appropriate + Makefile on your system; the path shown below is only an example. + Once built, you can install this policy package using the + <command>semodule</> command, which links supplied policy packages and + loads them into the kernel space. If this packages is correctly installed, <literal><command>semodule</> -l</> should list sepgsql-regtest as an available policy package. </para> <screen> +$ make -C ./contrib/sepgsql -f /usr/share/selinux/devel/Makefile $ su -# semodule -u /usr/local/pgsql/share/contrib/sepgsql-regtest.pp +# semodule -u ./contrib/sepgsql/sepgsql-regtest.pp # semodule -l : sepgsql-regtest 1.03 |