Adds SPDX deploy tasks to many recipes to record their output when consumed in an SBoM
Signed-off-by: Joshua Watt <[email protected]> --- meta/classes-recipe/barebox.bbclass | 3 ++- meta/classes-recipe/devicetree.bbclass | 3 ++- meta/classes-recipe/kernel-fit-image.bbclass | 3 ++- meta/classes-recipe/kernel.bbclass | 3 ++- meta/recipes-bsp/grub/grub-efi_2.14.bb | 3 ++- meta/recipes-bsp/opensbi/opensbi_1.8.1.bb | 3 ++- meta/recipes-bsp/u-boot/u-boot.inc | 3 ++- meta/recipes-core/systemd/systemd-boot_259.5.bb | 4 ++-- 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/meta/classes-recipe/barebox.bbclass b/meta/classes-recipe/barebox.bbclass index 73615999aa..0be611cf65 100644 --- a/meta/classes-recipe/barebox.bbclass +++ b/meta/classes-recipe/barebox.bbclass @@ -157,6 +157,7 @@ barebox_do_deploy () { done fi } -addtask deploy after do_compile +addtask deploy after do_compile do_create_spdx +SPDX_DEPLOY_TASKS += "do_deploy" EXPORT_FUNCTIONS do_configure do_compile do_install do_deploy diff --git a/meta/classes-recipe/devicetree.bbclass b/meta/classes-recipe/devicetree.bbclass index ce9d008aac..a313507251 100644 --- a/meta/classes-recipe/devicetree.bbclass +++ b/meta/classes-recipe/devicetree.bbclass @@ -163,7 +163,8 @@ devicetree_do_deploy() { install -Dm 0644 "${B}/$dtb_file" "${DEPLOYDIR}/devicetree/$dtb_file" done } -addtask deploy before do_build after do_install +addtask deploy before do_build after do_install do_create_spdx +SPDX_DEPLOY_TASKS += "do_deploy" EXPORT_FUNCTIONS do_compile do_install do_deploy diff --git a/meta/classes-recipe/kernel-fit-image.bbclass b/meta/classes-recipe/kernel-fit-image.bbclass index ae8f3c6688..becbc280ce 100644 --- a/meta/classes-recipe/kernel-fit-image.bbclass +++ b/meta/classes-recipe/kernel-fit-image.bbclass @@ -240,4 +240,5 @@ do_deploy() { fi fi } -addtask deploy after do_compile before do_build +addtask deploy after do_compile do_create_spdx before do_build +SPDX_DEPLOY_TASKS += "do_deploy" diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index 50cef17f69..5dc606048b 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass @@ -841,7 +841,8 @@ kernel_do_deploy() { # ensure we get the right values for both do_deploy[prefuncs] += "read_subpackage_metadata" -addtask deploy after do_install do_populate_sysroot do_packagedata +addtask deploy after do_install do_populate_sysroot do_packagedata do_create_spdx +SPDX_DEPLOY_TASKS += "do_deploy" EXPORT_FUNCTIONS do_deploy diff --git a/meta/recipes-bsp/grub/grub-efi_2.14.bb b/meta/recipes-bsp/grub/grub-efi_2.14.bb index 6354b43989..db187ac373 100644 --- a/meta/recipes-bsp/grub/grub-efi_2.14.bb +++ b/meta/recipes-bsp/grub/grub-efi_2.14.bb @@ -96,7 +96,8 @@ do_deploy() { install -m 644 ${B}/${GRUB_IMAGE_PREFIX}${GRUB_IMAGE} ${DEPLOYDIR} } -addtask deploy after do_install before do_build +addtask deploy after do_install do_create_spdx before do_build +SPDX_DEPLOY_TASKS += "do_deploy" FILES:${PN} = "${libdir}/grub/${GRUB_TARGET}-efi \ ${datadir}/grub \ diff --git a/meta/recipes-bsp/opensbi/opensbi_1.8.1.bb b/meta/recipes-bsp/opensbi/opensbi_1.8.1.bb index 0a9652c283..377a06fb78 100644 --- a/meta/recipes-bsp/opensbi/opensbi_1.8.1.bb +++ b/meta/recipes-bsp/opensbi/opensbi_1.8.1.bb @@ -44,7 +44,8 @@ do_deploy () { install -m 755 ${D}/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_dynamic.* ${DEPLOYDIR}/ } -addtask deploy before do_build after do_install +addtask deploy before do_build after do_install do_create_spdx +SPDX_DEPLOY_TASKS += "do_deploy" FILES:${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_jump.*" FILES:${PN} += "/share/opensbi/*/${RISCV_SBI_PLAT}/firmware/fw_payload.*" diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index a75948dfc3..1c3c9858df 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -470,4 +470,5 @@ uboot_deploy_spl () { ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK} } -addtask deploy before do_build after do_compile +addtask deploy before do_build after do_compile do_create_spdx +SPDX_DEPLOY_TASKS += "do_deploy" diff --git a/meta/recipes-core/systemd/systemd-boot_259.5.bb b/meta/recipes-core/systemd/systemd-boot_259.5.bb index c6c443f929..e2c579db97 100644 --- a/meta/recipes-core/systemd/systemd-boot_259.5.bb +++ b/meta/recipes-core/systemd/systemd-boot_259.5.bb @@ -71,5 +71,5 @@ do_deploy () { install ${B}/src/boot/addon*.efi.stub ${DEPLOYDIR} } -addtask deploy before do_build after do_compile - +addtask deploy before do_build after do_compile do_create_spdx +SPDX_DEPLOY_TASKS += "do_deploy" -- 2.54.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#238307): https://lists.openembedded.org/g/openembedded-core/message/238307 Mute This Topic: https://lists.openembedded.org/mt/119731707/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
