From 8f4759806ee868a32a063943059345641eb26f22 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 29 Oct 2024 22:07:43 -0700 Subject: create-spdx-{2.2,3.0}: fix do_create_spdx dependency while spdx include sources Call function ${@create_spdx_source_deps(d)} or ${create_spdx_source_deps(d)} along with addtask not working, use task do_create_spdx flag 'depends' to instead Move function create_spdx_source_deps to spdx-common.bbclass for both of create-spdx-2.2.bbclass and create-spdx-3.0.bbclass (From OE-Core rev: dda4b7ccd416ef370634babd150e944f2aa9116e) Signed-off-by: Hongxu Jia Reviewed-by: Joshua Watt Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/classes/create-spdx-3.0.bbclass | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'meta/classes/create-spdx-3.0.bbclass') diff --git a/meta/classes/create-spdx-3.0.bbclass b/meta/classes/create-spdx-3.0.bbclass index 5f0590198f..bc23d2d211 100644 --- a/meta/classes/create-spdx-3.0.bbclass +++ b/meta/classes/create-spdx-3.0.bbclass @@ -132,22 +132,8 @@ addtask do_create_spdx after \ do_collect_spdx_deps \ do_deploy_source_date_epoch \ do_populate_sysroot do_package do_packagedata \ - ${create_spdx_source_deps(d)} \ before do_populate_sdk do_populate_sdk_ext do_build do_rm_work -def create_spdx_source_deps(d): - deps = [] - if d.getVar("SPDX_INCLUDE_SOURCES") == "1": - deps.extend([ - # do_unpack is a hack for now; we only need it to get the - # dependencies do_unpack already has so we can extract the source - # ourselves - "do_unpack", - # For kernel source code - "do_shared_workdir", - ]) - return " ".join(deps) - SSTATETASKS += "do_create_spdx" do_create_spdx[sstate-inputdirs] = "${SPDXDEPLOY}" do_create_spdx[sstate-outputdirs] = "${DEPLOY_DIR_SPDX}" @@ -159,7 +145,10 @@ addtask do_create_spdx_setscene do_create_spdx[dirs] = "${SPDXWORK}" do_create_spdx[cleandirs] = "${SPDXDEPLOY} ${SPDXWORK}" -do_create_spdx[depends] += "${PATCHDEPENDENCY}" +do_create_spdx[depends] += " \ + ${PATCHDEPENDENCY} \ + ${@create_spdx_source_deps(d)} \ +" python do_create_package_spdx() { import oe.spdx30_tasks -- cgit v1.2.3-54-g00ecf