[{"id":34119,"web_url":"https://patchwork.libcamera.org/comment/34119/","msgid":"<20250502140458.GC22453@pendragon.ideasonboard.com>","date":"2025-05-02T14:04:58","subject":"Re: [libcamera-ci] [PATCH v1] cros-sdk-lite: Update to\n\trelease-R135-16209.B","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Barnabás,\n\nThank you for the patch.\n\nOn Fri, May 02, 2025 at 10:11:53AM +0200, Barnabás Pőcze wrote:\n> Update the chrome os sdk to a newer version that has Linux 5.4 kernel\n> headers as those will be needed to build libcamera in the future.\n> \n> This commit only updates the build scripts, and changes the image that\n> the CI uses; the image is built and uploaded to the registry separately.\n> \n> Signed-off-by: Barnabás Pőcze \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> .gitlab-ci/build-libcamera-cros.sh | 1 +\n> containers/cros-sdk-lite/.env | 2 +-\n> containers/cros-sdk-lite/Containerfile | 2 +-\n> ...-sdk-lib-Remove-mounting-of-configfs.patch | 37 -------------------\n> ...ssing-explicit-dependencies-for-the-.patch | 4 +-\n> ...-lc-compliance-with-the-dev-USE-flag.patch | 8 ++--\n> ...mera-Disable-all-meson-auto-features.patch | 4 +-\n> doc/container-cros-sdk-lite.rst | 2 +-\n> gitlab-ci.yml | 2 +-\n> 9 files changed, 13 insertions(+), 49 deletions(-)\n> delete mode 100644 containers/cros-sdk-lite/stage1/patches/chromite/0001-lib-cros-sdk-lib-Remove-mounting-of-configfs.patch\n> \n> diff --git a/.gitlab-ci/build-libcamera-cros.sh b/.gitlab-ci/build-libcamera-cros.sh\n> index b153c2a..cd92753 100755\n> --- a/.gitlab-ci/build-libcamera-cros.sh\n> +++ b/.gitlab-ci/build-libcamera-cros.sh\n> @@ -26,6 +26,7 @@ libcamera_cros_setup() {\n> \t\t-Dpipelines=ipu3,uvcvideo \\\n> \t\t-Dtest=false \\\n> \t\t-Dudev=enabled \\\n> +\t\t-Dcpp_std=c++20 \\\n> \t\tbuild\n> }\n> \n> diff --git a/containers/cros-sdk-lite/.env b/containers/cros-sdk-lite/.env\n> index 7c6836f..0ef5e34 100644\n> --- a/containers/cros-sdk-lite/.env\n> +++ b/containers/cros-sdk-lite/.env\n> @@ -1,2 +1,2 @@\n> CROS_SDK_BOARD=soraka-libcamera\n> -CROS_SDK_REVISION=release-R120-15662.B\n> +CROS_SDK_REVISION=release-R135-16209.B\n> diff --git a/containers/cros-sdk-lite/Containerfile b/containers/cros-sdk-lite/Containerfile\n> index 904724a..90e0aa0 100644\n> --- a/containers/cros-sdk-lite/Containerfile\n> +++ b/containers/cros-sdk-lite/Containerfile\n> @@ -15,7 +15,7 @@ FROM docker.io/library/debian:bookworm-slim AS cros-sdk-sources\n> ENV DEBIAN_FRONTEND=noninteractive\n> \n> ARG cros_board=soraka-libcamera\n> -ARG cros_sdk_revision=release-R120-15662.B\n> +ARG cros_sdk_revision=release-R135-16209.B\n> \n> RUN apt-get update && apt-get install --no-install-recommends -y \\\n> ca-certificates \\\n> diff --git a/containers/cros-sdk-lite/stage1/patches/chromite/0001-lib-cros-sdk-lib-Remove-mounting-of-configfs.patch b/containers/cros-sdk-lite/stage1/patches/chromite/0001-lib-cros-sdk-lib-Remove-mounting-of-configfs.patch\n> deleted file mode 100644\n> index 3cec160..0000000\n> --- a/containers/cros-sdk-lite/stage1/patches/chromite/0001-lib-cros-sdk-lib-Remove-mounting-of-configfs.patch\n> +++ /dev/null\n> @@ -1,37 +0,0 @@\n> -From 1a7f1358ab84dc76202c9cd63947fdbda2c2917d Mon Sep 17 00:00:00 2001\n> -From: Tomasz Figa \n> -Date: Mon, 15 Jan 2024 19:22:11 +0900\n> -Subject: [PATCH] lib: cros_sdk_lib: Remove mounting of configfs\n> -\n> -Remove mounting of configfs from cros_sdk setup. It seems to cause\n> -problems when running cros_sdk in non-privileged containers (like\n> -podman) and doesn't seem to be used.\n> -\n> -The feature was added to support iSCSI for some experiments with servo\n> -as a part of chromium:570766, but a later comment in the same bug states\n> -that it never ended up being used, but this piece of code apparently\n> -forgotten during the cleanup.\n> -\n> -BUG=chromium:570766\n> -TEST=./run_tests\n> -\n> -Reported-by: Laurent Pinchart \n> -Change-Id: I694eee3b1886a60c46d5e8cdcb274a6e50045549\n> ----\n> -\n> -diff --git a/lib/cros_sdk_lib.py b/lib/cros_sdk_lib.py\n> -index a320a79..646032e 100644\n> ---- a/lib/cros_sdk_lib.py\n> -+++ b/lib/cros_sdk_lib.py\n> -@@ -394,11 +394,6 @@\n> - # qemu, but nothing else currently.\n> - pass\n> -\n> -- if \"configfs\" in KNOWN_FILESYSTEMS:\n> -- osutils.Mount(\n> -- \"configfs\", path / \"sys/kernel/config\", \"configfs\", defflags\n> -- )\n> --\n> - # We expose /dev so we can access loopback & USB drives for flashing.\n> - osutils.Mount(\"/dev\", path / \"dev\", None, osutils.MS_BIND | osutils.MS_REC)\n> -\n> diff --git a/containers/cros-sdk-lite/stage1/patches/overlays/chromiumos-overlay/0001-libcamera-Add-missing-explicit-dependencies-for-the-.patch b/containers/cros-sdk-lite/stage1/patches/overlays/chromiumos-overlay/0001-libcamera-Add-missing-explicit-dependencies-for-the-.patch\n> index 9f91e67..9374773 100644\n> --- a/containers/cros-sdk-lite/stage1/patches/overlays/chromiumos-overlay/0001-libcamera-Add-missing-explicit-dependencies-for-the-.patch\n> +++ b/containers/cros-sdk-lite/stage1/patches/overlays/chromiumos-overlay/0001-libcamera-Add-missing-explicit-dependencies-for-the-.patch\n> @@ -34,10 +34,10 @@ diff --git a/eclass/libcamera.eclass b/eclass/libcamera.eclass\n> index 1575e8ae14f9..81f4f20b216d 100644\n> --- a/eclass/libcamera.eclass\n> +++ b/eclass/libcamera.eclass\n> -@@ -41,7 +41,11 @@ IUSE=\"debug dev doc test udev\"\n> - RDEPEND=\"\n> +@@ -56,7 +56,11 @@\n> \t${LIBCAMERA_DEPEND}\n> \tchromeos-base/cros-camera-libs:=\n> + \tchromeos-base/perfetto:=\n> -\tdev? ( dev-libs/libevent[threads] )\n> +\tdev? (\n> +\t\tdev-libs/libevent[threads]\n> diff --git a/containers/cros-sdk-lite/stage1/patches/overlays/chromiumos-overlay/0002-libcamera-Enable-lc-compliance-with-the-dev-USE-flag.patch b/containers/cros-sdk-lite/stage1/patches/overlays/chromiumos-overlay/0002-libcamera-Enable-lc-compliance-with-the-dev-USE-flag.patch\n> index 4b3844f..3bbc5b3 100644\n> --- a/containers/cros-sdk-lite/stage1/patches/overlays/chromiumos-overlay/0002-libcamera-Enable-lc-compliance-with-the-dev-USE-flag.patch\n> +++ b/containers/cros-sdk-lite/stage1/patches/overlays/chromiumos-overlay/0002-libcamera-Enable-lc-compliance-with-the-dev-USE-flag.patch\n> @@ -16,19 +16,19 @@ diff --git a/eclass/libcamera.eclass b/eclass/libcamera.eclass\n> index 81f4f20b216d..5b2484aaee00 100644\n> --- a/eclass/libcamera.eclass\n> +++ b/eclass/libcamera.eclass\n> -@@ -42,6 +42,7 @@ RDEPEND=\"\n> - \t${LIBCAMERA_DEPEND}\n> +@@ -57,6 +57,7 @@\n> \tchromeos-base/cros-camera-libs:=\n> + \tchromeos-base/perfetto:=\n> \tdev? (\n> +\t\tdev-cpp/gtest\n> \t\tdev-libs/libevent[threads]\n> \t\tmedia-libs/tiff\n> \t\tx11-libs/libdrm\n> -@@ -79,6 +80,7 @@ libcamera_src_configure() {\n> +@@ -94,6 +95,7 @@\n> \tlocal emesonargs=(\n> \t\t$(meson_use test)\n> \t\t$(meson_feature dev cam)\n> +\t\t$(meson_feature dev lc-compliance)\n> \t\t$(meson_feature doc documentation)\n> \t\t$(meson_feature udev udev)\n> - \t\t-Dandroid=\"enabled\"\n> + \t\t-Dcpp_std=c++20\n> diff --git a/containers/cros-sdk-lite/stage1/patches/overlays/chromiumos-overlay/0003-libcamera-Disable-all-meson-auto-features.patch b/containers/cros-sdk-lite/stage1/patches/overlays/chromiumos-overlay/0003-libcamera-Disable-all-meson-auto-features.patch\n> index 6a55985..3dbb0d9 100644\n> --- a/containers/cros-sdk-lite/stage1/patches/overlays/chromiumos-overlay/0003-libcamera-Disable-all-meson-auto-features.patch\n> +++ b/containers/cros-sdk-lite/stage1/patches/overlays/chromiumos-overlay/0003-libcamera-Disable-all-meson-auto-features.patch\n> @@ -19,11 +19,11 @@ diff --git a/eclass/libcamera.eclass b/eclass/libcamera.eclass\n> index 5b2484aaee00..347ac725a76c 100644\n> --- a/eclass/libcamera.eclass\n> +++ b/eclass/libcamera.eclass\n> -@@ -86,6 +86,7 @@ libcamera_src_configure() {\n> +@@ -102,6 +102,7 @@\n> \t\t-Dandroid=\"enabled\"\n> \t\t-Dandroid_platform=\"cros\"\n> \t\t-Dpipelines=\"${LIBCAMERA_PIPELINES}\"\n> +\t\t--auto-features disabled\n> + \t\t-Dpycamera=\"disabled\"\n> \t\t--buildtype \"$(usex debug debug plain)\"\n> \t\t--sysconfdir /etc/camera\n> - \t)\n> diff --git a/doc/container-cros-sdk-lite.rst b/doc/container-cros-sdk-lite.rst\n> index 17c6ac8..5c761d6 100644\n> --- a/doc/container-cros-sdk-lite.rst\n> +++ b/doc/container-cros-sdk-lite.rst\n> @@ -52,7 +52,7 @@ remaining of this document will refer to the token value as\n> \n> ~ $ podman login -u cros-sdk-lite-builder -p ${DEPLOY_TOKEN} registry.freedesktop.org\n> Login Succeeded!\n> - ~ $ podman push localhost/cros-sdk-lite-r120-15662:2024-01-16 docker://registry.freedesktop.org/${GITLAB_PROJECT}/cros-sdk-lite-r120-15662:2024-01-16.0\n> + ~ $ podman push localhost/cros-sdk-lite-r135-16209:2025-03-27 docker://registry.freedesktop.org/${GITLAB_PROJECT}/cros-sdk-lite-r135-16209:2025-03-27.0\n> Getting image source signatures\n> Copying blob 54dc9ff5151f done\n> Copying blob 30b0f9676fbc done\n> diff --git a/gitlab-ci.yml b/gitlab-ci.yml\n> index 11790bb..257b192 100644\n> --- a/gitlab-ci.yml\n> +++ b/gitlab-ci.yml\n> @@ -7,7 +7,7 @@ stages:\n> - test\n> \n> variables:\n> - CROS_SDK_IMAGE: 'registry.freedesktop.org/camera/libcamera/cros-sdk-lite-r120-15662:2024-01-16.0'\n> + CROS_SDK_IMAGE: 'registry.freedesktop.org/camera/libcamera/cros-sdk-lite-r135-16209:2025-03-27.0'\n> FDO_UPSTREAM_REPO: 'camera/libcamera'\n> GIT_DEPTH: 1\n> KERNEL_VERSION: '6.6'","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 07D6DBE08B\n\tfor ;\n\tFri, 2 May 2025 14:05:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E500868ADC;\n\tFri, 2 May 2025 16:05:08 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 52D5B68AD3\n\tfor ;\n\tFri, 2 May 2025 16:05:07 +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 ESMTPSA id 21C30AF;\n\tFri, 2 May 2025 16:04:59 +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=\"P8r1IeE8\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1746194699;\n\tbh=QdQNlOi+xOyltorK/kCfuEYateGDDqOxwlCoSttFwlA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=P8r1IeE8xFHgYOwkCX1jYGm6caoXXxWzvdwPxgGPWQ70c3hJDNYcPku+V866M35IN\n\tKxGmuJQdcAqvJnYJkPT8T9HHhV5uQsa0cYwA+N9tUh+NSzLCajF83x1vpVWb/a5sPd\n\tZYA8Y0oM+dZEjnN7dEIGZWEhGrwOYrsTexN2CnM0=","Date":"Fri, 2 May 2025 17:04:58 +0300","From":"Laurent Pinchart ","To":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [libcamera-ci] [PATCH v1] cros-sdk-lite: Update to\n\trelease-R135-16209.B","Message-ID":"<20250502140458.GC22453@pendragon.ideasonboard.com>","References":"<20250502081153.20104-1-barnabas.pocze@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20250502081153.20104-1-barnabas.pocze@ideasonboard.com>","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\" "}}]