{"id":24365,"url":"https://patchwork.libcamera.org/api/patches/24365/?format=json","web_url":"https://patchwork.libcamera.org/patch/24365/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20250912165458.32168-1-laurent.pinchart@ideasonboard.com>","date":"2025-09-12T16:54:58","name":"[libcamera-ci,v2] Add sphinx-book-theme package to container images","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"dcb7b2681df74791ea35c1706a822ca6d59b6e69","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/24365/mbox/","series":[{"id":5443,"url":"https://patchwork.libcamera.org/api/series/5443/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5443","date":"2025-09-12T16:54:58","name":"[libcamera-ci,v2] Add sphinx-book-theme package to container images","version":2,"mbox":"https://patchwork.libcamera.org/series/5443/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/24365/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/24365/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 78DE0C324E\n\tfor ;\n\tFri, 12 Sep 2025 16:55:28 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B404169367;\n\tFri, 12 Sep 2025 18:55:27 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 389F869367\n\tfor ;\n\tFri, 12 Sep 2025 18:55:25 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 6F082C1\n\tfor ;\n\tFri, 12 Sep 2025 18:54:09 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"WLU85vTN\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1757696049;\n\tbh=kpQg3xurdoOCAfWS2c+q0Y9Jc1OLHKhfi009aiouKJg=;\n\th=From:To:Subject:Date:From;\n\tb=WLU85vTNKcvEf11o8pTCvxPBacpz0tSBkdgjRoQNhv4MKW1l5k6LqmsFANzcE82Y/\n\tkF4NbhYKU6hXYCnnzZVPVgB9RlICY5C5PmdNsBrLjfGQS4edPb+9co8Smuu2lA1oHv\n\tvNt50Pbu/BBCjS02gqqxx9WhfSsOa10ZYWI6mrjg=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Subject":"[libcamera-ci] [PATCH v2] Add sphinx-book-theme package to container\n\timages","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","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"libcamera will soon switch to sphinx-book-theme for documentation. Add\nthe corresponding package to container images.\n\nSigned-off-by: Laurent Pinchart \n---\nChanges since v1:\n\n- Fix pip package name\n- Fix handling of missing debian packages\n---\n .gitlab-ci/setup-container.sh | 20 +++++++++++++++++---\n gitlab-ci.yml | 6 +++---\n 2 files changed, 20 insertions(+), 6 deletions(-)\n\n\nbase-commit: d58b30ed21a5663c5c6fd19da158de01b186831e","diff":"diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh\nindex 7029919c509c..9d8319c9779b 100755\n--- a/.gitlab-ci/setup-container.sh\n+++ b/.gitlab-ci/setup-container.sh\n@@ -111,6 +111,7 @@ PKGS_VIRTME_RUNTIME=(\n PKGS_PIP_MIN_VERSIONS=(\n \t'meson meson 1.2.0 remove'\n \t'python3-pygments pygments 2.10.0 keep'\n+\t'python3-sphinx-book-theme sphinx-book-theme 0.1.7 remove'\n \t'python3-sphinxcontrib.doxylink sphinxcontrib-doxylink 1.6.1 remove'\n )\n \n@@ -125,6 +126,8 @@ case $FDO_DISTRIBUTION_VERSION in\n \tPKGS_LIBCAMERA_RUNTIME+=( g++-9 )\n \t;;\n 'bookworm')\n+\t# Sphinx theme for the documentation.\n+\tPKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme )\n \t# libclang-rt-dev for the clang ASan runtime.\n \tPKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev )\n \t# For cam and lc-compliance\n@@ -134,6 +137,8 @@ case $FDO_DISTRIBUTION_VERSION in\n 'trixie')\n \t# gcc 13 to expand compilation testing coverage.\n \tPKGS_LIBCAMERA_RUNTIME+=( g++-13 )\n+\t# Sphinx theme for the documentation.\n+\tPKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme )\n \t# libclang-rt-dev for the clang ASan runtime.\n \tPKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev )\n \t;;\n@@ -196,7 +201,7 @@ cbuild_install_pkgs() {\n dpkg_version() {\n \tlocal pkg=$1\n \n-\tlocal version=$(dpkg -s $pkg | grep '^Version: ')\n+\tlocal version=$(dpkg -s $pkg 2>/dev/null | grep '^Version: ')\n \tversion=${version#* }\n \tversion=${version%%+*}\n \tversion=${version%%-*}\n@@ -230,8 +235,17 @@ cbuild_fixups() {\n \n \t\tlocal version=$(dpkg_version $pkg_name)\n \n-\t\tif dpkg_check_version $version $min_version ; then\n-\t\t\techo \"$pkg_name $version too old, installing $min_version from pip\"\n+\t\tif dpkg_check_version \"$version\" \"$min_version\" ; then\n+\t\t\tlocal reason\n+\n+\t\t\tif [[ -n \"$version\" ]] ; then\n+\t\t\t\treason=\"$version too old\"\n+\t\t\telse\n+\t\t\t\treason=\"missing\"\n+\t\t\t\taction=\n+\t\t\tfi\n+\n+\t\t\techo \"$pkg_name $reason, installing $min_version from pip\"\n \n \t\t\tif [[ $action == 'remove' ]] ; then\n \t\t\t\tapt remove -y ${pkg_name}\ndiff --git a/gitlab-ci.yml b/gitlab-ci.yml\nindex 57607dbfe7e4..e5bcc6883c95 100644\n--- a/gitlab-ci.yml\n+++ b/gitlab-ci.yml\n@@ -59,17 +59,17 @@ include:\n .libcamera-ci.debian:11:\n variables:\n FDO_DISTRIBUTION_VERSION: 'bullseye'\n- FDO_DISTRIBUTION_TAG: '2025-07-27.1'\n+ FDO_DISTRIBUTION_TAG: '2025-09-12.2'\n \n .libcamera-ci.debian:12:\n variables:\n FDO_DISTRIBUTION_VERSION: 'bookworm'\n- FDO_DISTRIBUTION_TAG: '2025-07-27.1'\n+ FDO_DISTRIBUTION_TAG: '2025-09-12.2'\n \n .libcamera-ci.debian:13:\n variables:\n FDO_DISTRIBUTION_VERSION: 'trixie'\n- FDO_DISTRIBUTION_TAG: '2025-07-27.1'\n+ FDO_DISTRIBUTION_TAG: '2025-09-12.2'\n \n .container-debian:\n extends:\n","prefixes":["libcamera-ci","v2"]}