aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-06-04 00:41:08 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-06-05 14:31:28 -0300
commit1ed4afb0d1d1a06fd675df9f11d65b30d60a2d4e (patch)
tree4bc2a59c7087e188be0b4ef8d83eef45464a426b
parentAdd comment for enabling D-Bus desktop notifications to transmission-{gtk,qt}... (diff)
downloadfirejail-1ed4afb0d1d1a06fd675df9f11d65b30d60a2d4e.tar.gz
firejail-1ed4afb0d1d1a06fd675df9f11d65b30d60a2d4e.tar.zst
firejail-1ed4afb0d1d1a06fd675df9f11d65b30d60a2d4e.zip
mkdeb.sh.in: stop enabling apparmor
Since `make deb-apparmor` already exists, use that for now instead of changing what `make deb` does. This fixes CI. Added on commit 494b26d50 ("adding --enable-apparmor by default for make deb - most Debian-based distros have apparmor enabled by default", 2022-06-03). Kind of relates to #5154.
-rw-r--r--README2
-rwxr-xr-xmkdeb.sh.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/README b/README
index 44a8a9360..d5352f26a 100644
--- a/README
+++ b/README
@@ -34,7 +34,7 @@ $ sudo apt-get install git build-essential libapparmor-dev pkg-config gawk
34For --selinux option, add libselinux1-dev (libselinux-devel for Fedora). 34For --selinux option, add libselinux1-dev (libselinux-devel for Fedora).
35 35
36We build our release firejail.tar.xz and firejail.deb packages using the following command: 36We build our release firejail.tar.xz and firejail.deb packages using the following command:
37$ make distclean && ./configure && make deb 37$ make distclean && ./configure && make deb-apparmor
38 38
39 39
40Maintainer: 40Maintainer:
diff --git a/mkdeb.sh.in b/mkdeb.sh.in
index 4b0c8d912..79f8d748c 100755
--- a/mkdeb.sh.in
+++ b/mkdeb.sh.in
@@ -28,7 +28,7 @@ echo "*****************************************"
28tar -xJvf "$CODE_ARCHIVE" 28tar -xJvf "$CODE_ARCHIVE"
29#mkdir -p "$INSTALL_DIR" 29#mkdir -p "$INSTALL_DIR"
30cd "$CODE_DIR" 30cd "$CODE_DIR"
31./configure --prefix=/usr --enable-apparmor "$@" 31./configure --prefix=/usr "$@"
32make -j2 32make -j2
33mkdir debian 33mkdir debian
34DESTDIR=debian make install-strip 34DESTDIR=debian make install-strip