Skip to content

Commit

Permalink
mkdeb.sh.in: stop running ./configure
Browse files Browse the repository at this point in the history
On firejail 0.9.68, one would run `./configure` (to generate Makefile
from Makefile.in) and then running `make deb` would end up running
something akin to:

    make distclean && make dist && ./configure --prefix=/usr && mkdeb.sh

As of netblue30#5142, `make dist` does not run `make distclean` anymore, but
`make deb` still overrides any configure options that the user might
have set.

Stop doing that and do just `make dist && mkdeb.sh` on `make deb`.

To build everything from scratch as `make deb` would do on 0.9.68 (but
without it overriding the configure options), one can run:

    make distclean && ./configure --prefix=/usr && make deb

Note that this is basically what the "build_debian_package" job on
.gitlab-ci.yml does (see also the "build_apparmor" job).

Should fully fix netblue30#3523.

Relates to netblue30#772 netblue30#1205.
  • Loading branch information
kmk3 committed May 20, 2022
1 parent b457200 commit 6dd0b8d
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions mkdeb.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@ HAVE_APPARMOR=@HAVE_APPARMOR@
HAVE_SELINUX=@HAVE_SELINUX@
EXTRA_VERSION=$1

CONFIG_ARGS="--prefix=/usr"
if [ -n "$HAVE_APPARMOR" ]; then
CONFIG_ARGS="$CONFIG_ARGS --enable-apparmor"
fi
if [ -n "$HAVE_SELINUX" ]; then
CONFIG_ARGS="$CONFIG_ARGS --enable-selinux"
fi

TOP="$PWD"
CODE_ARCHIVE="$NAME-$VERSION.tar.xz"
CODE_DIR="$NAME-$VERSION"
Expand All @@ -38,7 +30,6 @@ echo "*****************************************"
tar -xJvf "$CODE_ARCHIVE"
#mkdir -p "$INSTALL_DIR"
cd "$CODE_DIR"
./configure $CONFIG_ARGS
make -j2
mkdir debian
DESTDIR=debian make install-strip
Expand Down

0 comments on commit 6dd0b8d

Please sign in to comment.