generate seccomp filters at install time

2 files changed, 8 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index 30e1ad176..6ef77bf6d 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ SYNTAX_FILES := $(SYNTAX_FILES_IN:.in=)
 ALL_ITEMS = $(APPS) $(SBOX_APPS) $(SBOX_APPS_NON_DUMPABLE) $(MYLIBS)
 
 .PHONY: all
-all: all_items mydirs filters $(CONTRIB_TARGET)
+all: all_items mydirs $(CONTRIB_TARGET)
 
 config.mk config.sh:
         @printf 'error: run ./configure to generate %s\n' "$@" >&2
@@ -53,28 +53,19 @@ mydirs: $(MYDIRS)
 $(MYDIRS):
         $(MAKE) -C $@
 
-.PHONY: filters
-filters: $(SECCOMP_FILTERS) $(SBOX_APPS_NON_DUMPABLE)
-seccomp: src/fseccomp/fseccomp src/fsec-optimize/fsec-optimize
+define build_filters
         src/fseccomp/fseccomp default seccomp
         src/fsec-optimize/fsec-optimize seccomp
-
-seccomp.debug: src/fseccomp/fseccomp src/fsec-optimize/fsec-optimize
         src/fseccomp/fseccomp default seccomp.debug allow-debuggers
         src/fsec-optimize/fsec-optimize seccomp.debug
-
-seccomp.32: src/fseccomp/fseccomp src/fsec-optimize/fsec-optimize
         src/fseccomp/fseccomp secondary 32 seccomp.32
         src/fsec-optimize/fsec-optimize seccomp.32
-
-seccomp.block_secondary: src/fseccomp/fseccomp
         src/fseccomp/fseccomp secondary block seccomp.block_secondary
-
-seccomp.mdwx: src/fseccomp/fseccomp
         src/fseccomp/fseccomp memory-deny-write-execute seccomp.mdwx
-
-seccomp.mdwx.32: src/fseccomp/fseccomp
         src/fseccomp/fseccomp memory-deny-write-execute.32 seccomp.mdwx.32
+endef
+
+
 
 # Makes all targets in contrib/
 .PHONY: contrib
@@ -187,6 +178,7 @@ endif
         # libraries and plugins
         install -m 0755 -d $(DESTDIR)$(libdir)/firejail
         install -m 0755 -t $(DESTDIR)$(libdir)/firejail src/firecfg/firejail-welcome.sh
+        $(call build_filters)
         install -m 0644 -t $(DESTDIR)$(libdir)/firejail $(MYLIBS) $(SECCOMP_FILTERS)
         install -m 0755 -t $(DESTDIR)$(libdir)/firejail $(SBOX_APPS)
         install -m 0755 -t $(DESTDIR)$(libdir)/firejail src/profstats/profstats
diff --git a/RELNOTES b/RELNOTES
index 718ac17a4..e356d712a 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -20,6 +20,8 @@ firejail (0.9.73) baseline; urgency=low
     #5618)
   * bugfix: fix --hostname and --hosts-file commands
   * bugfix: arp.c: ensure positive timeout on select(2) (#5806)
+  * bugfix: makefiles fixes: seccomp filters and man pages are build every
+     time when running make
   * build: auto-generate syntax files (#5627)
   * build: mark all phony targets as such (#5637)
   * build: mkdeb.sh: pass all arguments to ./configure (#5654)