From 1ed4afb0d1d1a06fd675df9f11d65b30d60a2d4e Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Sat, 4 Jun 2022 00:41:08 -0300 Subject: 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. --- README | 2 +- mkdeb.sh.in | 2 +- 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 For --selinux option, add libselinux1-dev (libselinux-devel for Fedora). We build our release firejail.tar.xz and firejail.deb packages using the following command: -$ make distclean && ./configure && make deb +$ make distclean && ./configure && make deb-apparmor Maintainer: 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 "*****************************************" tar -xJvf "$CODE_ARCHIVE" #mkdir -p "$INSTALL_DIR" cd "$CODE_DIR" -./configure --prefix=/usr --enable-apparmor "$@" +./configure --prefix=/usr "$@" make -j2 mkdir debian DESTDIR=debian make install-strip -- cgit v1.2.3-54-g00ecf