From f33e452b044af0b651784a43e6981078eb0c0540 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Sun, 5 Feb 2023 08:43:07 -0300 Subject: 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. --- contrib/update_deb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/update_deb.sh') diff --git a/contrib/update_deb.sh b/contrib/update_deb.sh index 4ee652024..ad6e728f1 100755 --- a/contrib/update_deb.sh +++ b/contrib/update_deb.sh @@ -15,7 +15,7 @@ cd firejail sed -i "s/# restricted-network .*/restricted-network yes/" \ etc/firejail.config -make deb-apparmor +make deb sudo dpkg -i firejail*.deb echo "Firejail updated." cd .. -- cgit v1.2.3-70-g09d2