From patchwork Mon Jul 28 15:32:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 24008 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 3EFF9C3237 for ; Mon, 28 Jul 2025 15:32:18 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4A619691C6; Mon, 28 Jul 2025 17:32:17 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="deEWN5cw"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 11CA7691B9 for ; Mon, 28 Jul 2025 17:32:12 +0200 (CEST) Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id D73CC465 for ; Mon, 28 Jul 2025 17:31:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1753716690; bh=w0uuYjIldZzneg9RMX85eMNsxXRUHqWbR3uoeupia6o=; h=From:To:Subject:Date:In-Reply-To:References:From; b=deEWN5cw9TXarQfjcxOQ96p1yFyeS60eyzdSxlVjujh0oy7Jz9nWssz8XWWJL8StC XsryKqcr8JDlYytDQlg74IjJguFwQSsEzcz4H334TfjCG7OS+up20ZeSRa0w8PJxbq kqjQ+Ts4ndVE+O1f7d1Qy3XNK9Uf/crim11ks9pY= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [libcamera-ci] [PATCH v2 2/3] setup-container: Generalize package installation through pip Date: Mon, 28 Jul 2025 18:32:00 +0300 Message-ID: <20250728153201.7843-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.49.1 In-Reply-To: <20250728153201.7843-1-laurent.pinchart@ideasonboard.com> References: <20250728153201.7843-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" When building containers, we favour packages from the Debian repositories, and fall back to pip when minimum version requirements are not met by Debian. This is open-coded for two packages (meson and python3-pygments). Generalize the mechanism in preparation for adding more packages. Signed-off-by: Laurent Pinchart Reviewed-by: Barnabás Pőcze --- Changes since v1: - Document the PKGS_PIP_MIN_VERSIONS array --- .gitlab-ci/setup-container.sh | 56 +++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh index 5e9b89da8431..7fdac1f9fb66 100755 --- a/.gitlab-ci/setup-container.sh +++ b/.gitlab-ci/setup-container.sh @@ -93,6 +93,24 @@ PKGS_VIRTME_RUNTIME=( udev ) +# Each entry in the PKGS_PIP_MIN_VERSIONS array describes one package and +# contains 4 space-separated fields: +# +# - The Debian package name +# - The PyPI package name +# - The minimum version +# - Whether to keep or remove the Debian package if a newer version is +# installed from PyPI +# +# Keeping Debian packages is sometimes needed due to dependencies. For +# instance, uninstalling python3-pygments would also uninstall python3-sphinx +# that depends on it. + +PKGS_PIP_MIN_VERSIONS=( + 'meson meson 1.2.0 remove' + 'python3-pygments pygments 2.10.0 keep' +) + archs=( amd64 ) declare -A components @@ -192,34 +210,34 @@ dpkg_check_version() { cbuild_fixups() { echo "Applying miscellaneous fixups" - local min_version local pip3_options - local version + local pkg if [[ $FDO_DISTRIBUTION_VERSION != 'bullseye' ]] ; then pip3_options=--break-system-packages fi - # Install meson from pip. - min_version=1.2.0 - version=$(dpkg_version meson) - if dpkg_check_version $version $min_version ; then - echo "meson $version too old, installing $min_version from pip" + # Install packages from pip to ensure minimum versions. + for pkg in "${PKGS_PIP_MIN_VERSIONS[@]}" ; do + pkg=($pkg) + local pkg_name=${pkg[0]} + local pip_name=${pkg[1]} + local min_version=${pkg[2]} + local action=${pkg[3]} - apt remove -y meson - apt install -y python3-pip - pip3 install ${pip3_options} meson==${min_version} - fi + local version=$(dpkg_version $pkg_name) - # Install pygments from pip. - min_version=2.10.0 - version=$(dpkg_version python3-pygments) - if dpkg_check_version $version $min_version ; then - echo "pygments $version too old, installing $min_version from pip" + if dpkg_check_version $version $min_version ; then + echo "$pkg_name $version too old, installing $min_version from pip" - apt install -y python3-pip - pip3 install ${pip3_options} pygments==${min_version} - fi + if [[ $action == 'remove' ]] ; then + apt remove -y ${pkg_name} + fi + + apt install -y python3-pip + pip3 install ${pip3_options} ${pip_name}==${min_version} + fi + done # Create pybind11.pc manually if not provided by the distribution # package.