Adds a class that allows recipes to opt out of generating SPDX
Signed-off-by: Joshua Watt <[email protected]>
---
meta/classes-recipe/nospdx.bbclass | 13 +++++++++++++
meta/recipes-core/meta/build-sysroots.bb | 5 +----
meta/recipes-core/meta/meta-world-pkgdata.bb | 3 +--
3 files changed, 15 insertions(+), 6 deletions(-)
create mode 100644 meta/classes-recipe/nospdx.bbclass
diff --git a/meta/classes-recipe/nospdx.bbclass
b/meta/classes-recipe/nospdx.bbclass
new file mode 100644
index 00000000000..b20e28218be
--- /dev/null
+++ b/meta/classes-recipe/nospdx.bbclass
@@ -0,0 +1,13 @@
+#
+# Copyright OpenEmbedded Contributors
+#
+# SPDX-License-Identifier: MIT
+#
+
+deltask do_collect_spdx_deps
+deltask do_create_spdx
+deltask do_create_spdx_runtime
+deltask do_create_package_spdx
+deltask do_create_rootfs_spdx
+deltask do_create_image_spdx
+deltask do_create_image_sbom
diff --git a/meta/recipes-core/meta/build-sysroots.bb
b/meta/recipes-core/meta/build-sysroots.bb
index db05c111ab2..b0b8fb3c79a 100644
--- a/meta/recipes-core/meta/build-sysroots.bb
+++ b/meta/recipes-core/meta/build-sysroots.bb
@@ -7,7 +7,7 @@ STANDALONE_SYSROOT_NATIVE = "${STAGING_DIR}/${BUILD_ARCH}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
EXCLUDE_FROM_WORLD = "1"
-inherit nopackages
+inherit nopackages nospdx
deltask fetch
deltask unpack
deltask patch
@@ -17,9 +17,6 @@ deltask configure
deltask compile
deltask install
deltask populate_sysroot
-deltask create_spdx
-deltask collect_spdx_deps
-deltask create_runtime_spdx
deltask recipe_qa
do_build_warn () {
diff --git a/meta/recipes-core/meta/meta-world-pkgdata.bb
b/meta/recipes-core/meta/meta-world-pkgdata.bb
index 0438bf61387..244175ddd44 100644
--- a/meta/recipes-core/meta/meta-world-pkgdata.bb
+++ b/meta/recipes-core/meta/meta-world-pkgdata.bb
@@ -27,14 +27,13 @@ python do_collect_packagedata() {
oe.copy_buildsystem.generate_locked_sigs(sigfile, d)
}
+inherit nospdx
deltask do_fetch
deltask do_unpack
deltask do_patch
deltask do_configure
deltask do_compile
deltask do_install
-deltask do_create_spdx
-deltask do_create_spdx_runtime
do_prepare_recipe_sysroot[deptask] = ""
--
2.43.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#201098):
https://lists.openembedded.org/g/openembedded-core/message/201098
Mute This Topic: https://lists.openembedded.org/mt/106851843/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
