| Message ID | 20241216172827.1055088-2-barnabas.pocze@ideasonboard.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series |
|
| Related | show |
Hi Barnabás, Thank you for the patch. On Mon, Dec 16, 2024 at 06:28:25PM +0100, Barnabás Pőcze wrote: > `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 <barnabas.pocze@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > .gitlab-ci/setup-container.sh | 3 +++ > gitlab-ci.yml | 2 +- > 2 files changed, 4 insertions(+), 1 deletion(-) > > 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:
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:
`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 <barnabas.pocze@ideasonboard.com> --- .gitlab-ci/setup-container.sh | 3 +++ gitlab-ci.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) -- 2.47.1