From patchwork Thu Mar 7 22:18:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dufresne X-Patchwork-Id: 19638 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 AB63AC32AF for ; Thu, 7 Mar 2024 22:18:30 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 623A462877; Thu, 7 Mar 2024 23:18:29 +0100 (CET) Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [IPv6:2a00:1098:ed:100::25]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A2BFF62865 for ; Thu, 7 Mar 2024 23:18:26 +0100 (CET) Received: from nicolas-tpx395.lan (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nicolas) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 0256137820C3; Thu, 7 Mar 2024 22:18:25 +0000 (UTC) From: Nicolas Dufresne To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 1/5] Use full registry path for the CrOS docker Date: Thu, 7 Mar 2024 17:18:06 -0500 Message-ID: <20240307221810.2109348-2-nicolas@ndufresne.ca> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240307221810.2109348-1-nicolas@ndufresne.ca> References: <20240307221810.2109348-1-nicolas@ndufresne.ca> 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: , Cc: Nicolas Dufresne Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Nicolas Dufresne This is not built by the pipeline and won't be found in the users namespace. Signed-off-by: Nicolas Dufresne Reviewed-by: Kieran Bingham --- gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab-ci.yml b/gitlab-ci.yml index 81ab8c4..a4e1ef4 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -7,7 +7,7 @@ stages: - test variables: - CROS_SDK_IMAGE: '${CI_REGISTRY_IMAGE}/cros-sdk-lite-r120-15662:2024-01-16.0' + CROS_SDK_IMAGE: 'registry.freedesktop.org/camera/libcamera/cros-sdk-lite-r120-15662:2024-01-16.0' GIT_DEPTH: 1 KERNEL_VERSION: '6.6' MESON_ALL_OPTIONS: >- From patchwork Thu Mar 7 22:18:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dufresne X-Patchwork-Id: 19639 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 ABC61BD160 for ; Thu, 7 Mar 2024 22:18:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1B4996286F; Thu, 7 Mar 2024 23:18:30 +0100 (CET) Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [IPv6:2a00:1098:ed:100::25]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 80DB262865 for ; Thu, 7 Mar 2024 23:18:27 +0100 (CET) Received: from nicolas-tpx395.lan (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nicolas) by madrid.collaboradmins.com (Postfix) with ESMTPSA id C4FE03781FF7; Thu, 7 Mar 2024 22:18:26 +0000 (UTC) From: Nicolas Dufresne To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 2/5] Add missing FDO_UPSTREAM_REPO Date: Thu, 7 Mar 2024 17:18:07 -0500 Message-ID: <20240307221810.2109348-3-nicolas@ndufresne.ca> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240307221810.2109348-1-nicolas@ndufresne.ca> References: <20240307221810.2109348-1-nicolas@ndufresne.ca> 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: , Cc: Nicolas Dufresne Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Nicolas Dufresne Without that all forks are doomed to recreate the dockers. Signed-off-by: Nicolas Dufresne Reviewed-by: Kieran Bingham --- gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/gitlab-ci.yml b/gitlab-ci.yml index a4e1ef4..105971d 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -7,6 +7,7 @@ stages: - test variables: + FDO_UPSTREAM_REPO: 'camera/libcamera' CROS_SDK_IMAGE: 'registry.freedesktop.org/camera/libcamera/cros-sdk-lite-r120-15662:2024-01-16.0' GIT_DEPTH: 1 KERNEL_VERSION: '6.6' From patchwork Thu Mar 7 22:18:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dufresne X-Patchwork-Id: 19640 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 CD74EC32AF for ; Thu, 7 Mar 2024 22:18:32 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 89AFE62875; Thu, 7 Mar 2024 23:18:32 +0100 (CET) Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [IPv6:2a00:1098:ed:100::25]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 652C46286C for ; Thu, 7 Mar 2024 23:18:28 +0100 (CET) Received: from nicolas-tpx395.lan (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nicolas) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 9BD0B3781FF7; Thu, 7 Mar 2024 22:18:27 +0000 (UTC) From: Nicolas Dufresne To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 3/5] qemu: Print error logs on unit test failure Date: Thu, 7 Mar 2024 17:18:08 -0500 Message-ID: <20240307221810.2109348-4-nicolas@ndufresne.ca> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240307221810.2109348-1-nicolas@ndufresne.ca> References: <20240307221810.2109348-1-nicolas@ndufresne.ca> 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: , Cc: Nicolas Dufresne Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Nicolas Dufresne The error logs very often holds the information needed to fix the failure, don't hide it. Signed-off-by: Nicolas Dufresne Reviewed-by: Kieran Bingham --- .gitlab-ci/test-libcamera-qemu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/test-libcamera-qemu.sh b/.gitlab-ci/test-libcamera-qemu.sh index 068f2ff..f9de5ab 100755 --- a/.gitlab-ci/test-libcamera-qemu.sh +++ b/.gitlab-ci/test-libcamera-qemu.sh @@ -26,7 +26,7 @@ libcamera_unit_test() { virtme-ng --verbose --skip-modules --force-9p \ --rwdir "$PWD/build" \ --run /opt/linux/bzImage \ - --exec "meson test -C build --no-rebuild ; echo \\\$? > build/.test-status" + --exec "meson test -C build --no-rebuild --print-errorlogs; echo \\\$? > build/.test-status" local status=$(cat build/.test-status) echo "Test result exit state: $status" From patchwork Thu Mar 7 22:18:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dufresne X-Patchwork-Id: 19641 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 66D94C32C3 for ; Thu, 7 Mar 2024 22:18:33 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E50D76287B; Thu, 7 Mar 2024 23:18:32 +0100 (CET) Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 21E8862871 for ; Thu, 7 Mar 2024 23:18:29 +0100 (CET) Received: from nicolas-tpx395.lan (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nicolas) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 6927B37820C3; Thu, 7 Mar 2024 22:18:28 +0000 (UTC) From: Nicolas Dufresne To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 4/5] docker: Install appsink element Date: Thu, 7 Mar 2024 17:18:09 -0500 Message-ID: <20240307221810.2109348-5-nicolas@ndufresne.ca> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240307221810.2109348-1-nicolas@ndufresne.ca> References: <20240307221810.2109348-1-nicolas@ndufresne.ca> 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: , Cc: Nicolas Dufresne Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Nicolas Dufresne Some new tests required appsink element. Install the required package. Signed-off-by: Nicolas Dufresne Reviewed-by: Kieran Bingham --- .gitlab-ci/setup-container.sh | 1 + gitlab-ci.yml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh index 6027433..29cdd2a 100755 --- a/.gitlab-ci/setup-container.sh +++ b/.gitlab-ci/setup-container.sh @@ -55,6 +55,7 @@ PKGS_LIBCAMERA_RUNTIME=( ) PKGS_LIBCAMERA_RUNTIME_MULTIARCH=( + gstreamer1.0-plugins-base libdrm-dev libdw-dev libexif-dev diff --git a/gitlab-ci.yml b/gitlab-ci.yml index 105971d..8f455da 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -53,17 +53,17 @@ include: .libcamera-ci.debian:10: variables: FDO_DISTRIBUTION_VERSION: 'buster' - FDO_DISTRIBUTION_TAG: '2024-01-09.2' + FDO_DISTRIBUTION_TAG: '2024-04-07.3' .libcamera-ci.debian:12: variables: FDO_DISTRIBUTION_VERSION: 'bookworm' - FDO_DISTRIBUTION_TAG: '2024-01-09.1' + FDO_DISTRIBUTION_TAG: '2024-04-07.3' .libcamera-ci.debian:13: variables: FDO_DISTRIBUTION_VERSION: 'trixie' - FDO_DISTRIBUTION_TAG: '2024-01-09.0' + FDO_DISTRIBUTION_TAG: '2024-04-07.3' .container-debian: extends: From patchwork Thu Mar 7 22:18:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dufresne X-Patchwork-Id: 19642 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 DE22DC32C4 for ; Thu, 7 Mar 2024 22:18:33 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4D29F6295C; Thu, 7 Mar 2024 23:18:33 +0100 (CET) Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id EB6F662865 for ; Thu, 7 Mar 2024 23:18:29 +0100 (CET) Received: from nicolas-tpx395.lan (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nicolas) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 3631E3781FF7; Thu, 7 Mar 2024 22:18:29 +0000 (UTC) From: Nicolas Dufresne To: libcamera-devel@lists.libcamera.org Subject: [PATCH v1 5/5] build-libcamera-common: Fix comment typo 'corss' to 'cross' Date: Thu, 7 Mar 2024 17:18:10 -0500 Message-ID: <20240307221810.2109348-6-nicolas@ndufresne.ca> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240307221810.2109348-1-nicolas@ndufresne.ca> References: <20240307221810.2109348-1-nicolas@ndufresne.ca> 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: , Cc: Nicolas Dufresne Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Nicolas Dufresne Signed-off-by: Nicolas Dufresne Reviewed-by: Kieran Bingham --- .gitlab-ci/build-libcamera-common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/build-libcamera-common.sh b/.gitlab-ci/build-libcamera-common.sh index 1a4005c..6bc2e8f 100755 --- a/.gitlab-ci/build-libcamera-common.sh +++ b/.gitlab-ci/build-libcamera-common.sh @@ -21,7 +21,7 @@ PKGS_CLANG_NATIVE_DEPS=( # # If this becomes problematic in the future, possible alternatives are creating # different container images for different architectures, or switching to a -# different corss-compilation environment (likely based on buildroot). +# different cross-compilation environment (likely based on buildroot). PKGS_LIBCAMERA_NATIVE_DEPS=( libevent-dev