aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-02-05 08:43:07 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-02-17 10:42:08 -0300
commitf33e452b044af0b651784a43e6981078eb0c0540 (patch)
tree9ea59c0ac99b311f7fee9797053cedc6ba0937fc /contrib
parentci: deb: remove redundant --prefix arguments (diff)
downloadfirejail-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 'contrib')
-rwxr-xr-xcontrib/update_deb.sh2
1 files changed, 1 insertions, 1 deletions
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
15sed -i "s/# restricted-network .*/restricted-network yes/" \ 15sed -i "s/# restricted-network .*/restricted-network yes/" \
16 etc/firejail.config 16 etc/firejail.config
17 17
18make deb-apparmor 18make deb
19sudo dpkg -i firejail*.deb 19sudo dpkg -i firejail*.deb
20echo "Firejail updated." 20echo "Firejail updated."
21cd .. 21cd ..