diff options
| author |  Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-05-13 23:33:20 -0300 |
|---|---|---|
| committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-05-29 18:59:13 -0300 |
| commit | 9a0fbbd719b6d6c6fe46ae0f4b2e0ccd7988edcc (patch) | |
| tree | 02e0adba5386a4d9c3319d2eec953d161e56df48 /.gitlab-ci.yml | |
| parent | fj-mkdeb.py: run distclean before ./configure (diff) | |
| download | firejail-9a0fbbd719b6d6c6fe46ae0f4b2e0ccd7988edcc.tar.gz firejail-9a0fbbd719b6d6c6fe46ae0f4b2e0ccd7988edcc.tar.zst firejail-9a0fbbd719b6d6c6fe46ae0f4b2e0ccd7988edcc.zip | |
mkdeb.sh.in: pass remaining arguments to ./configure
Currently, mkdeb.sh (which is used to make a .deb package) runs
./configure with hardcoded options (some of which are automatically
detected based on configure-time variables). To work around the
hardcoding, contrib/fj-mkdeb.py is used to add additional options by
rewriting the actual call to ./configure on mkdeb.sh. For example, the
following invocation adds --disable-firetunnel to mkdeb.sh:
$ ./configure && ./contrib/fj-mkdeb.py --disable-firetunnel
To avoid depending on another script and to avoid re-generating
mkdeb.sh, just let the latter pass the remaining arguments (the first
one is an optional package filename suffix) to ./configure directly.
Example:
$ make distclean && ./configure && make dist &&
./mkdeb.sh "" --disable-firetunnel
Additionally, change contrib/fj-mkdeb.py to do roughly the same as the
above example, by simply forwarding the arguments that it receives to
./mkdeb.sh (which then forwards them to ./configure). Also, remove the
--only-fix-mkdeb option, since the script does not change mkdeb.sh
anymore. With these changes, the script's usage (other than when using
--only-fix-mkdeb) should remain the same.
Note: To clean the generated files and then make a .deb package using
the default configuration, the invocation is still the same:
$ make distclean && ./configure && make deb
Note2: Running ./configure in the above examples is only needed for
generating Makefile/mkdeb.sh from Makefile.in/mkdeb.sh.in after running
distclean, so that running `make` / `./mkdeb.sh` afterwards works.
Should fully fix #772.
Relates to #1205 #3414 #5148.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4871ef031..af590e2e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml | |||
| @@ -54,7 +54,7 @@ build_apparmor: | |||
| 54 | script: | 54 | script: |
| 55 | - apt-get update -qq | 55 | - apt-get update -qq |
| 56 | - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config gawk | 56 | - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian libapparmor-dev pkg-config gawk |
| 57 | - ./configure --prefix=/usr --enable-apparmor && make deb-apparmor && dpkg -i firejail*.deb | 57 | - ./configure && make deb-apparmor && dpkg -i firejail*.deb |
| 58 | - command -V firejail && firejail --version | 58 | - command -V firejail && firejail --version |
| 59 | - firejail --version | grep -F 'AppArmor support is enabled' | 59 | - firejail --version | grep -F 'AppArmor support is enabled' |
| 60 | 60 | ||