[PATCH 0/3] Update make clean instructions and .gitgnore files

[PATCH 0/3] Update make clean instructions and .gitgnore files

[Nicolas Iooss]

Hello,

While working on testing the selinux-userspace project on several
configurations (compiler, compiler flags, libc, Python version...) it is
quite convenient that "make clean" leaves the directory clean, both from
a git prespective ("git ls-files --ignored --others --exclude-standard")
and from a build point of view (all generated and cached files are
removed).

These patches update the relevant .gitignore and Makefile files to
achieve this.

Cheers,
Nicolas

Nicolas Iooss (3):
  Update .gitignore files
  sepolgen: remove additional files when cleaning
  libsepol: remove libsepol.map when cleaning

 libselinux/utils/.gitignore        | 5 +++++
 libsemanage/tests/.gitignore       | 1 +
 libsepol/src/Makefile              | 2 +-
 libsepol/tests/.gitignore          | 1 +
 libsepol/tests/policies/.gitignore | 3 +++
 sepolgen/src/sepolgen/Makefile     | 3 +--
 sepolgen/tests/.gitignore          | 4 ++++
 sepolgen/tests/Makefile            | 3 +++
 8 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 libsemanage/tests/.gitignore
 create mode 100644 libsepol/tests/.gitignore
 create mode 100644 libsepol/tests/policies/.gitignore
 create mode 100644 sepolgen/tests/.gitignore

-- 
2.8.2

[PATCH 1/3] Update .gitignore files

[Nicolas Iooss]

Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
---
 libselinux/utils/.gitignore        | 5 +++++
 libsemanage/tests/.gitignore       | 1 +
 libsepol/tests/.gitignore          | 1 +
 libsepol/tests/policies/.gitignore | 3 +++
 sepolgen/tests/.gitignore          | 4 ++++
 5 files changed, 14 insertions(+)
 create mode 100644 libsemanage/tests/.gitignore
 create mode 100644 libsepol/tests/.gitignore
 create mode 100644 libsepol/tests/policies/.gitignore
 create mode 100644 sepolgen/tests/.gitignore

diff --git a/libselinux/utils/.gitignore b/libselinux/utils/.gitignore
index 060eaabd1a72..ed3bf0bb28f9 100644
--- a/libselinux/utils/.gitignore
+++ b/libselinux/utils/.gitignore
@@ -14,7 +14,12 @@ getseuser
 matchpathcon
 policyvers
 sefcontext_compile
+selabel_digest
+selabel_lookup
+selabel_lookup_best_match
+selabel_partial_match
 selinux_check_securetty_context
+selinux_restorecon
 selinuxenabled
 selinuxexeccon
 setenforce
diff --git a/libsemanage/tests/.gitignore b/libsemanage/tests/.gitignore
new file mode 100644
index 000000000000..f07111dba429
--- /dev/null
+++ b/libsemanage/tests/.gitignore
@@ -0,0 +1 @@
+libsemanage-tests
diff --git a/libsepol/tests/.gitignore b/libsepol/tests/.gitignore
new file mode 100644
index 000000000000..c3f60fd2b945
--- /dev/null
+++ b/libsepol/tests/.gitignore
@@ -0,0 +1 @@
+libsepol-tests
diff --git a/libsepol/tests/policies/.gitignore b/libsepol/tests/policies/.gitignore
new file mode 100644
index 000000000000..5a547a8aa9df
--- /dev/null
+++ b/libsepol/tests/policies/.gitignore
@@ -0,0 +1,3 @@
+test-downgrade/
+test-*/*.mls
+test-*/*.std
diff --git a/sepolgen/tests/.gitignore b/sepolgen/tests/.gitignore
new file mode 100644
index 000000000000..c120af8a0067
--- /dev/null
+++ b/sepolgen/tests/.gitignore
@@ -0,0 +1,4 @@
+module_compile_test.fc
+module_compile_test.if
+output
+tmp/
-- 
2.8.2

[PATCH 2/3] sepolgen: remove additional files when cleaning

[Nicolas Iooss]

Remove the files created by Python 3 and refpolicy building process.

Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
---
 sepolgen/src/sepolgen/Makefile | 3 +--
 sepolgen/tests/Makefile        | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sepolgen/src/sepolgen/Makefile b/sepolgen/src/sepolgen/Makefile
index 9ac765151478..d3aa7715c488 100644
--- a/sepolgen/src/sepolgen/Makefile
+++ b/sepolgen/src/sepolgen/Makefile
@@ -11,5 +11,4 @@ install: all
 clean:
 	rm -f parser.out parsetab.py
 	rm -f *~ *.pyc
-
-
+	rm -rf __pycache__
diff --git a/sepolgen/tests/Makefile b/sepolgen/tests/Makefile
index 924a9bed6bcd..e17eef229ff3 100644
--- a/sepolgen/tests/Makefile
+++ b/sepolgen/tests/Makefile
@@ -4,8 +4,11 @@ clean:
 	rm -f *~ *.pyc
 	rm -f parser.out parsetab.py
 	rm -f out.txt
+	rm -f module_compile_test.fc
+	rm -f module_compile_test.if
 	rm -f module_compile_test.pp
 	rm -f output
+	rm -rf __pycache__ tmp
 
 test:
 	$(PYTHON) run-tests.py
-- 
2.8.2

[PATCH 3/3] libsepol: remove libsepol.map when cleaning

[Nicolas Iooss]

Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
---
 libsepol/src/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsepol/src/Makefile b/libsepol/src/Makefile
index db6c2bac7692..c0c3274a9197 100644
--- a/libsepol/src/Makefile
+++ b/libsepol/src/Makefile
@@ -76,7 +76,7 @@ relabel:
 	/sbin/restorecon $(SHLIBDIR)/$(LIBSO)
 
 clean: 
-	-rm -f $(LIBPC) $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(TARGET) $(CIL_GENERATED)
+	-rm -f $(LIBPC) $(LIBMAP) $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(TARGET) $(CIL_GENERATED)
 
 indent:
 	../../scripts/Lindent $(wildcard *.[ch])
-- 
2.8.2

Re: [PATCH 0/3] Update make clean instructions and .gitgnore files

[Stephen Smalley]

On 05/05/2016 08:02 AM, Nicolas Iooss wrote:
> Hello,
> 
> While working on testing the selinux-userspace project on several
> configurations (compiler, compiler flags, libc, Python version...) it is
> quite convenient that "make clean" leaves the directory clean, both from
> a git prespective ("git ls-files --ignored --others --exclude-standard")
> and from a build point of view (all generated and cached files are
> removed).
> 
> These patches update the relevant .gitignore and Makefile files to
> achieve this.

Thanks, applied.

> 
> Cheers,
> Nicolas
> 
> Nicolas Iooss (3):
>   Update .gitignore files
>   sepolgen: remove additional files when cleaning
>   libsepol: remove libsepol.map when cleaning
> 
>  libselinux/utils/.gitignore        | 5 +++++
>  libsemanage/tests/.gitignore       | 1 +
>  libsepol/src/Makefile              | 2 +-
>  libsepol/tests/.gitignore          | 1 +
>  libsepol/tests/policies/.gitignore | 3 +++
>  sepolgen/src/sepolgen/Makefile     | 3 +--
>  sepolgen/tests/.gitignore          | 4 ++++
>  sepolgen/tests/Makefile            | 3 +++
>  8 files changed, 19 insertions(+), 3 deletions(-)
>  create mode 100644 libsemanage/tests/.gitignore
>  create mode 100644 libsepol/tests/.gitignore
>  create mode 100644 libsepol/tests/policies/.gitignore
>  create mode 100644 sepolgen/tests/.gitignore
>