From 89d45e6cf246037cfe097d7bd3dddef1687d684b Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Tue, 14 Feb 2023 16:55:04 -0300 Subject: [PATCH] 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. --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af590e2e17b..b0af96cf999 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 @@ -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: