Skip to content

Commit

Permalink
ci: deb: remove redundant --prefix arguments
Browse files Browse the repository at this point in the history
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 netblue30#5154.
  • Loading branch information
kmk3 committed Feb 17, 2023
1 parent 9837161 commit 89d45e6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ build_ubuntu_package:
script:
- apt-get update -qq
- DEBIAN_FRONTEND=noninteractive apt-get install -y -qq build-essential lintian pkg-config python3 gawk
- ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb
- ./configure && make deb && dpkg -i firejail*.deb
- command -V firejail && firejail --version
- python3 contrib/sort.py etc/profile-*/*.profile etc/inc/*.inc

Expand All @@ -19,7 +19,7 @@ build_debian_package:
script:
- apt-get update -qq
- apt-get install -y -qq build-essential lintian pkg-config gawk
- ./configure --prefix=/usr && make deb && dpkg -i firejail*.deb
- ./configure && make deb && dpkg -i firejail*.deb
- command -V firejail && firejail --version

build_redhat_package:
Expand Down

0 comments on commit 89d45e6

Please sign in to comment.