diff options
author | 2023-02-05 08:43:07 -0300 | |
---|---|---|
committer | 2023-02-17 10:42:08 -0300 | |
commit | f33e452b044af0b651784a43e6981078eb0c0540 (patch) | |
tree | 9ea59c0ac99b311f7fee9797053cedc6ba0937fc /Makefile | |
parent | ci: deb: remove redundant --prefix arguments (diff) | |
download | firejail-f33e452b044af0b651784a43e6981078eb0c0540.tar.gz firejail-f33e452b044af0b651784a43e6981078eb0c0540.tar.zst firejail-f33e452b044af0b651784a43e6981078eb0c0540.zip |
build: deb: enable apparmor by default & remove deb-apparmor
The official .deb package is always built with apparmor support, so use
`--enable-apparmor` in mkdeb.sh and remove the "deb-apparmor" target in
order to reduce redundancy.
Note that custom configure options may be specified by calling
./mkdeb.sh directly.
For example, to build the .deb package without apparmor support, instead
of running `make deb`, the following commands can be used:
make dist
./mkdeb.sh --disable-apparmor
Also, change the `build_apparmor` GitLab CI job into
`build_no_apparmor`, which is intended to check that building without
apparmor still works.
Note: This commit makes the resulting .deb package not have an
"-apparmor" suffix (see `EXTRA_VERSION` in mkdeb.sh), to avoid
redundancy (as having apparmor support becomes the default).
Misc: This is a follow-up to #5654.
Relates to #5154 #5176 #5547.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -339,10 +339,6 @@ asc: config.mk | |||
339 | deb: dist config.sh | 339 | deb: dist config.sh |
340 | ./mkdeb.sh | 340 | ./mkdeb.sh |
341 | 341 | ||
342 | .PHONY: deb-apparmor | ||
343 | deb-apparmor: dist config.sh | ||
344 | env EXTRA_VERSION=-apparmor ./mkdeb.sh --enable-apparmor | ||
345 | |||
346 | .PHONY: test-compile | 342 | .PHONY: test-compile |
347 | test-compile: dist config.mk | 343 | test-compile: dist config.mk |
348 | cd test/compile; ./compile.sh $(TARNAME)-$(VERSION) | 344 | cd test/compile; ./compile.sh $(TARNAME)-$(VERSION) |