From patchwork Fri Jul 25 09:09:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 23952 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 C7560BDCC1 for ; Fri, 25 Jul 2025 09:09:28 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E31AA6908D; Fri, 25 Jul 2025 11:09:27 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Z3ZjBv2N"; 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 86B0869080 for ; Fri, 25 Jul 2025 11:09:26 +0200 (CEST) Received: from pb-laptop.local (185.221.140.39.nat.pool.zt.hu [185.221.140.39]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id C1193C0B for ; Fri, 25 Jul 2025 11:08:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1753434526; bh=YAvfcNrqoqWnUJH4L55Zno6YH3/odErVFIZmVksQ2LM=; h=From:To:Subject:Date:From; b=Z3ZjBv2NFC/tAyH5yK17pfEtd74qk7BP3spbLK04xdFSrmjbkR6n/PHL5xGuyZFiy bHKBr7k+ymRcxn2fjcCiuRFqpN3L9/UgpAn7l7g9QO9IiSBV587DYoKSo3SQhb9Uwl qPNwL0evc7+XsHLbsv29/+XMS9gxIjCPxMMEEdP8= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [libcamera-ci] [PATCH v1] setup-container: Update bullseye-backports Date: Fri, 25 Jul 2025 11:09:22 +0200 Message-ID: <20250725090922.2486359-1-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.50.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" bullseye-backports has reached end-of-life[0]. So update the address for the package repository, rebuild the container as well. This also necessitates changes in the gcc 13 build since gcc 13 not being the native compiler for debian 13 now fails to link against the gcc 14 compiled static gtest libraries since it refers to new symbols. Solve this by forcing meson to fall back to the wrap dependency. [0]: https://lists.debian.org/debian-backports-announce/2024/07/msg00000.html Signed-off-by: Barnabás Pőcze --- .gitlab-ci/setup-container.sh | 2 +- gitlab-ci.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.50.1 diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh index 8d29e1c..5e9b89d 100755 --- a/.gitlab-ci/setup-container.sh +++ b/.gitlab-ci/setup-container.sh @@ -145,7 +145,7 @@ cbuild_install_pkgs() { # The qt6-tools-dev-tools package is only available for bullseye in the # backports repository. Enable backports only for that version. if [[ $FDO_DISTRIBUTION_VERSION == 'bullseye' ]] ; then - echo "deb http://deb.debian.org/debian bullseye-backports main" \ + echo "deb http://archive.debian.org/debian bullseye-backports main" \ > /etc/apt/sources.list.d/bullseye-backports.list apt update fi diff --git a/gitlab-ci.yml b/gitlab-ci.yml index 6dfe4f4..3370176 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -60,7 +60,7 @@ include: .libcamera-ci.debian:11: variables: FDO_DISTRIBUTION_VERSION: 'bullseye' - FDO_DISTRIBUTION_TAG: '2025-02-27.1' + FDO_DISTRIBUTION_TAG: '2025-07-24.1' .libcamera-ci.debian:12: variables: @@ -224,6 +224,7 @@ build-full:debian:13: MESON_OPTIONS: >- ${MESON_ALL_OPTIONS} -D cpp_std=c++20 + -D force_fallback_for=['gtest'] - ARCH: amd64 CC: gcc-14 CXX: g++-14