diff options
| author |  Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-02-14 16:55:04 -0300 |
|---|---|---|
| committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-02-17 10:30:17 -0300 |
| commit | 89d45e6cf246037cfe097d7bd3dddef1687d684b (patch) | |
| tree | 0ad9f38b99bcf32a9a342a013eb72b0aca11d07b /.gitlab-ci.yml | |
| parent | ci: move --prefix configure arg first (diff) | |
| download | firejail-89d45e6cf246037cfe097d7bd3dddef1687d684b.tar.gz firejail-89d45e6cf246037cfe097d7bd3dddef1687d684b.tar.zst firejail-89d45e6cf246037cfe097d7bd3dddef1687d684b.zip | |
ci: deb: remove redundant --prefix arguments
The "deb" target depends on the "dist" target, which creates an archive
from DISTFILES.
The arguments to ./configure are misleading, as they do not affect the
archive that is used by `make deb`. That is the case because the
configure output files (config.mk and config.sh) are not copied into the
dist archive, only their input files (config.mk.in and config.sh.in).
In order to affect the .deb package, the configure arguments have to be
passed to mkdeb.sh, which then forwards them to ./configure itself.
Note: This does not apply to the rpm-based jobs, as `make rpms` uses the
files directly rather than using the dist archive.
Relates to #5154.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af590e2e1..b0af96cf9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml | |||
| @@ -10,7 +10,7 @@ build_ubuntu_package: | |||
| 10 | script: | 10 | script: |
| 11 | - apt-get update -qq | 11 | - apt-get update -qq |
| 12 | - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian pkg-config python3 gawk | 12 | - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian pkg-config python3 gawk |
| 13 | - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb | 13 | - ./configure && make deb && dpkg -i firejail*.deb |
| 14 | - command -V firejail && firejail --version | 14 | - command -V firejail && firejail --version |
| 15 | - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc | 15 | - python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc |
| 16 | 16 | ||
| @@ -19,7 +19,7 @@ build_debian_package: | |||
| 19 | script: | 19 | script: |
| 20 | - apt-get update -qq | 20 | - apt-get update -qq |
| 21 | - apt-get install -y -qq build-essential lintian pkg-config gawk | 21 | - apt-get install -y -qq build-essential lintian pkg-config gawk |
| 22 | - ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb | 22 | - ./configure && make deb && dpkg -i firejail*.deb |
| 23 | - command -V firejail && firejail --version | 23 | - command -V firejail && firejail --version |
| 24 | 24 | ||
| 25 | build_redhat_package: | 25 | build_redhat_package: |