Re: [PATCH 1/1] debsbom: update to version 0.5.1 and rework dependencies

[Zhihang Wei <wzh@ilbers.de>]

Applied to next, thanks.

Zhihang

On 1/14/26 12:27, 'Felix Moessbauer' via isar-users wrote:
> In debsbom 0.5 the serializer dependencies are now all optional. Support
> for them is only needed if serializing to the corresponding format. By
> that, we need to manually install them in the sbom rootfs. Further, we
> can remove them as build-time dependencies in the python3-debsbom
> recipe, which increases the concurrency in the build and reduces the
> total build time.
>
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
> PS: @Zdenek This release still does not model the virtual packages, but
> you can use it to just update the SRCREV to the latest commit on debsbom
> master for testing. Once you confirm that this solves the issue, we will
> cut debsbom 0.6.0 and update this patch as well.
>
> Cheers!
> Felix
>
>   meta/recipes-devtools/sbom-chroot/sbom-chroot.bb         | 7 +++++--
>   ...python3-debsbom_0.4.0.bb => python3-debsbom_0.5.1.bb} | 9 +++------
>   2 files changed, 8 insertions(+), 8 deletions(-)
>   rename meta/recipes-support/python3-debsbom/{python3-debsbom_0.4.0.bb => python3-debsbom_0.5.1.bb} (77%)
>
> diff --git a/meta/recipes-devtools/sbom-chroot/sbom-chroot.bb b/meta/recipes-devtools/sbom-chroot/sbom-chroot.bb
> index 5cf43db8..bf6d6683 100644
> --- a/meta/recipes-devtools/sbom-chroot/sbom-chroot.bb
> +++ b/meta/recipes-devtools/sbom-chroot/sbom-chroot.bb
> @@ -17,8 +17,11 @@ ROOTFS_FEATURES:remove = "generate-initrd"
>   ROOTFS_INSTALL_COMMAND:remove = "rootfs_restore_initrd_tooling"
>   
>   # additional packages for the SBOM chroot
> -SBOM_IMAGE_INSTALL = "python3-debsbom"
> -DEPENDS += "python3-debsbom"
> +DEPENDS:append:bookworm = " python3-cyclonedx-lib"
> +DEPENDS:append:noble = " python3-cyclonedx-lib"
> +DEPENDS += "python3-debsbom python3-spdx-tools"
> +
> +SBOM_IMAGE_INSTALL = "python3-debsbom python3-spdx-tools python3-cyclonedx-lib"
>   
>   ROOTFSDIR = "${WORKDIR}/rootfs"
>   ROOTFS_PACKAGES = "${SBOM_IMAGE_INSTALL}"
> diff --git a/meta/recipes-support/python3-debsbom/python3-debsbom_0.4.0.bb b/meta/recipes-support/python3-debsbom/python3-debsbom_0.5.1.bb
> similarity index 77%
> rename from meta/recipes-support/python3-debsbom/python3-debsbom_0.4.0.bb
> rename to meta/recipes-support/python3-debsbom/python3-debsbom_0.5.1.bb
> index 410f358a..f1524129 100644
> --- a/meta/recipes-support/python3-debsbom/python3-debsbom_0.4.0.bb
> +++ b/meta/recipes-support/python3-debsbom/python3-debsbom_0.5.1.bb
> @@ -9,9 +9,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
>   
>   S = "${WORKDIR}/git"
>   
> -DEPENDS = "python3-spdx-tools"
> -DEPENDS:append:bookworm = " python3-packageurl python3-cyclonedx-lib"
> -DEPENDS:append:noble = " python3-packageurl python3-cyclonedx-lib"
> +DEPENDS:append:bookworm = " python3-packageurl"
> +DEPENDS:append:noble = " python3-packageurl"
>   
>   S = "${WORKDIR}/git"
>   
> @@ -22,8 +21,6 @@ DEBIAN_BUILD_DEPENDS = "dh-python, \
>                           python3-setuptools, \
>                           pybuild-plugin-pyproject, \
>                           python3-packageurl, \
> -                        python3-cyclonedx-lib, \
> -                        python3-spdx-tools, \
>                           python3-debian, \
>                           python3-requests, \
>                           python3-zstandard, \
> @@ -37,7 +34,7 @@ SRC_URI = "git://github.com/siemens/debsbom.git;protocol=https;branch=main; \
>              file://rules \
>              file://0001-Use-old-license-description-in-pyproject.toml.patch \
>              "
> -SRCREV = "a600f60966d08803eb17bfb81eb8828921497453"
> +SRCREV = "ba63720dfc0dc6dcb01994031e092aaebb62a399"
>   
>   do_prepare_build[cleandirs] += "${S}/debian"
>   do_prepare_build() {

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/d3fca6d0-515d-4f10-8fdb-ac4fb254142b%40ilbers.de.