From patchwork Tue Dec 17 15:31:51 2024 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: 22381 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 643CEC32F6 for ; Tue, 17 Dec 2024 15:32:02 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1BDCB67FE0; Tue, 17 Dec 2024 16:32:00 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="oHr9aig1"; 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 9B6D867FD3 for ; Tue, 17 Dec 2024 16:31:56 +0100 (CET) Received: from pb-laptop.local (185.221.140.157.nat.pool.zt.hu [185.221.140.157]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 2D2BD4C7; Tue, 17 Dec 2024 16:31:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1734449479; bh=pU18mA0zXGfmF5O9BtzrneXQZrg8LcQfa8tCIYzpn0s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oHr9aig13RTTaO+/BIvIC9A1SMRvsM2ZqG/smg8pS13baxvyrP55eDwYmK7tkjPrY 1sNs7CY9eQIEBWe0dw/kwps1fTpCWnrJJtFH7MKtOvm8c+s7jQf429diW92hab0LqE NBtMfBdrb9GWnWPGZeUaoAj0JbNJZpatjz90DyUc= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Cc: Laurent Pinchart Subject: [libcamera-ci] [RFC PATCH v3 2/4] Add `libevent` runtime libraries to the container Date: Tue, 17 Dec 2024 16:31:51 +0100 Message-ID: <20241217153153.140417-2-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241217153153.140417-1-barnabas.pocze@ideasonboard.com> References: <20241217153153.140417-1-barnabas.pocze@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" `libevent` is needed for some components, specifically `cam` and `lc-compliance`. Installing `libevent-dev` would be more convenient, but it is not doable at the moment because that package is not multiarch compatible. So only install the necessary runtime libraries. Build jobs already install `libevent-dev` when necessary before building libcamera, but this change enables the aforementioned components to be usable in different jobs as well. Signed-off-by: Barnabás Pőcze Reviewed-by: Laurent Pinchart --- .gitlab-ci/setup-container.sh | 3 +++ gitlab-ci.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) -- 2.47.1 diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh index d2909c7..0658368 100755 --- a/.gitlab-ci/setup-container.sh +++ b/.gitlab-ci/setup-container.sh @@ -103,6 +103,9 @@ case $FDO_DISTRIBUTION_VERSION in 'bookworm') # libclang-rt-dev for the clang ASan runtime. PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev ) + # For cam and lc-compliance + # libevent-dev cannot be used here, see build-libcamera-common.sh + PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libevent-2.1-7 libevent-pthreads-2.1-7 ) ;; 'trixie') # gcc 13 to expand compilation testing coverage. diff --git a/gitlab-ci.yml b/gitlab-ci.yml index 6d26680..f679d6e 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -65,7 +65,7 @@ include: .libcamera-ci.debian:12: variables: FDO_DISTRIBUTION_VERSION: 'bookworm' - FDO_DISTRIBUTION_TAG: '2024-12-12.1' + FDO_DISTRIBUTION_TAG: '2024-12-16.1' .libcamera-ci.debian:13: variables: