From patchwork Fri Sep 12 16:54:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 24365 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 78DE0C324E for ; Fri, 12 Sep 2025 16:55:28 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B404169367; Fri, 12 Sep 2025 18:55:27 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="WLU85vTN"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 389F869367 for ; Fri, 12 Sep 2025 18:55:25 +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 6F082C1 for ; Fri, 12 Sep 2025 18:54:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1757696049; bh=kpQg3xurdoOCAfWS2c+q0Y9Jc1OLHKhfi009aiouKJg=; h=From:To:Subject:Date:From; b=WLU85vTNKcvEf11o8pTCvxPBacpz0tSBkdgjRoQNhv4MKW1l5k6LqmsFANzcE82Y/ kF4NbhYKU6hXYCnnzZVPVgB9RlICY5C5PmdNsBrLjfGQS4edPb+9co8Smuu2lA1oHv vNt50Pbu/BBCjS02gqqxx9WhfSsOa10ZYWI6mrjg= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [libcamera-ci] [PATCH v2] Add sphinx-book-theme package to container images Date: Fri, 12 Sep 2025 19:54:58 +0300 Message-ID: <20250912165458.32168-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.49.1 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" libcamera will soon switch to sphinx-book-theme for documentation. Add the corresponding package to container images. Signed-off-by: Laurent Pinchart --- Changes since v1: - Fix pip package name - Fix handling of missing debian packages --- .gitlab-ci/setup-container.sh | 20 +++++++++++++++++--- gitlab-ci.yml | 6 +++--- 2 files changed, 20 insertions(+), 6 deletions(-) base-commit: d58b30ed21a5663c5c6fd19da158de01b186831e diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh index 7029919c509c..9d8319c9779b 100755 --- a/.gitlab-ci/setup-container.sh +++ b/.gitlab-ci/setup-container.sh @@ -111,6 +111,7 @@ PKGS_VIRTME_RUNTIME=( PKGS_PIP_MIN_VERSIONS=( 'meson meson 1.2.0 remove' 'python3-pygments pygments 2.10.0 keep' + 'python3-sphinx-book-theme sphinx-book-theme 0.1.7 remove' 'python3-sphinxcontrib.doxylink sphinxcontrib-doxylink 1.6.1 remove' ) @@ -125,6 +126,8 @@ case $FDO_DISTRIBUTION_VERSION in PKGS_LIBCAMERA_RUNTIME+=( g++-9 ) ;; 'bookworm') + # Sphinx theme for the documentation. + PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme ) # libclang-rt-dev for the clang ASan runtime. PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev ) # For cam and lc-compliance @@ -134,6 +137,8 @@ case $FDO_DISTRIBUTION_VERSION in 'trixie') # gcc 13 to expand compilation testing coverage. PKGS_LIBCAMERA_RUNTIME+=( g++-13 ) + # Sphinx theme for the documentation. + PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme ) # libclang-rt-dev for the clang ASan runtime. PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev ) ;; @@ -196,7 +201,7 @@ cbuild_install_pkgs() { dpkg_version() { local pkg=$1 - local version=$(dpkg -s $pkg | grep '^Version: ') + local version=$(dpkg -s $pkg 2>/dev/null | grep '^Version: ') version=${version#* } version=${version%%+*} version=${version%%-*} @@ -230,8 +235,17 @@ cbuild_fixups() { local version=$(dpkg_version $pkg_name) - if dpkg_check_version $version $min_version ; then - echo "$pkg_name $version too old, installing $min_version from pip" + if dpkg_check_version "$version" "$min_version" ; then + local reason + + if [[ -n "$version" ]] ; then + reason="$version too old" + else + reason="missing" + action= + fi + + echo "$pkg_name $reason, installing $min_version from pip" if [[ $action == 'remove' ]] ; then apt remove -y ${pkg_name} diff --git a/gitlab-ci.yml b/gitlab-ci.yml index 57607dbfe7e4..e5bcc6883c95 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -59,17 +59,17 @@ include: .libcamera-ci.debian:11: variables: FDO_DISTRIBUTION_VERSION: 'bullseye' - FDO_DISTRIBUTION_TAG: '2025-07-27.1' + FDO_DISTRIBUTION_TAG: '2025-09-12.2' .libcamera-ci.debian:12: variables: FDO_DISTRIBUTION_VERSION: 'bookworm' - FDO_DISTRIBUTION_TAG: '2025-07-27.1' + FDO_DISTRIBUTION_TAG: '2025-09-12.2' .libcamera-ci.debian:13: variables: FDO_DISTRIBUTION_VERSION: 'trixie' - FDO_DISTRIBUTION_TAG: '2025-07-27.1' + FDO_DISTRIBUTION_TAG: '2025-09-12.2' .container-debian: extends: