spdx30_tasks: Fix SPDX_CUSTOM_ANNOTATION_VARS implementation
PATCH v2 1/1 spdx30_tasks: Fix SPDX_CUSTOM_ANNOTATION_VARS implementation
From: Stefano Tondo <[email protected]>
Fix incorrect function call when processing SPDX_CUSTOM_ANNOTATION_VARS. The code was calling new_annotation() as a standalone function, but it should be called as a method on the build_objset object.
Error:
new_annotation(d, build_objset, build, ...)
Corrected to:
build_objset.new_annotation(d, build_objset, build, ...)
This bug would cause a NameError at runtime if SPDX_CUSTOM_ANNOTATION_VARS was set to a non-empty value, preventing SPDX document generation.
The fix aligns with how new_annotation() is called elsewhere in the codebase and matches the SBOMObjset class method signature.
---
Changes in v2:
- Fixed test bugs: corrected SPDX file path from packages/ to recipes/
- Fixed test bugs: removed parentheses from objset.objects() call
- Fixed whitespace formatting in test code
--- meta/lib/oe/spdx30_tasks.py | 4 +- meta/lib/oeqa/selftest/cases/spdx.py | 74 ++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 3 deletions(-)
meta/lib/oe/spdx30_tasks.py +1 -3
@@ -498,9 +498,7 @@ def create_spdx(d): build_objset.set_is_native(is_native) for var in (d.getVar("SPDX_CUSTOM_ANNOTATION_VARS") or "").split(): - new_annotation( - d, - build_objset, + build_objset.new_annotation( build, "%s=%s" % (var, d.getVar(var)), oe.spdx30.AnnotationType.other,
meta/lib/oeqa/selftest/cases/spdx.py +74 -0
77 lines not on this page · raw message
Signature · 1 line
2.51.1
Quoted 18 lines · Stefano Tondo
From: Stefano Tondo <[email protected]>
Fix incorrect function call when processing
SPDX_CUSTOM_ANNOTATION_VARS. The code was callingnew_annotation()as a standalone function, but it should be called as a method on thebuild_objsetobject.Error:
new_annotation(d, build_objset, build, ...)Corrected to:
build_objset.new_annotation(d, build_objset, build, ...)This bug would cause a NameError at runtime if
SPDX_CUSTOM_ANNOTATION_VARSwas set to a non-empty value, preventing SPDX document generation.The fix aligns with how
new_annotation()is called elsewhere in the codebase and matches the SBOMObjset class method signature.
Quoted 8 lines
Signed-off-by Stefano Tondo <[email protected]>---
Changes in v2:
- Fixed test bugs: corrected SPDX file path from packages/ to recipes/
- Fixed test bugs: removed parentheses fromobjset.objects()call
- Fixed whitespace formatting in test code
---
Hi Stefano,
Thanks for the v2, but it looks like the test is still failing with a similar error:
2025-11-18 18:36:56,500 - oe-selftest - INFO - spdx.SPDX30Check.test_custom_annotation_vars (subunit.RemotedTestCase) 2025-11-18 18:36:56,500 - oe-selftest - INFO - ... FAIL
...
File "/srv/pokybuild/yocto-worker/oe-selftest-debian/build/layers/openembedded-core/meta/lib/oeqa/selftest/cases/spdx.py", line 330, in test_custom_annotation_vars
self.assertIsNotNone(build, "Unable to find Build element")
~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3.13/unittest/case.py", line 1309, in assertIsNotNone
self.fail(self._formatMessage(msg, standardMsg))
~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3.13/unittest/case.py", line 732, in fail
raise self.failureException(msg)
AssertionError: unexpectedly None : Unable to find Build element
https://autobuilder.yoctoproject.org/valkyrie/#/builders/35/builds/2716
https://autobuilder.yoctoproject.org/valkyrie/#/builders/48/builds/2610
https://autobuilder.yoctoproject.org/valkyrie/#/builders/23/builds/2852
Can you have a look at these?
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Hi Mathieu,
Weird, this time oe-selftest was passing. Anything else I need to check locally to make sure it is working properly?
2025-11-19 12:25:28,520 - oe-selftest - INFO - test_custom_annotation_vars (spdx.SPDX30Check.test_custom_annotation_vars) 2025-11-19 12:26:22,548 - oe-selftest - INFO - Found ANNOTATION1: ANNOTATION1=TestAnnotation1 2025-11-19 12:26:22,548 - oe-selftest - INFO - Found ANNOTATION2: ANNOTATION2=TestAnnotation2 2025-11-19 12:26:22,549 - oe-selftest - INFO - ... ok 2025-11-19 12:26:27,823 - oe-selftest - INFO - ---------------------------------------------------------------------- 2025-11-19 12:26:27,823 - oe-selftest - INFO - Ran 1 test in 59.471s 2025-11-19 12:26:27,823 - oe-selftest - INFO - OK 2025-11-19 12:26:32,996 - oe-selftest - INFO - RESULTS: 2025-11-19 12:26:32,996 - oe-selftest - INFO - RESULTS - spdx.SPDX30Check.test_custom_annotation_vars: PASSED (54.03s) 2025-11-19 12:26:32,997 - oe-selftest - INFO - SUMMARY: 2025-11-19 12:26:32,997 - oe-selftest - INFO - oe-selftest () - Ran 1 test in 59.471s 2025-11-19 12:26:32,997 - oe-selftest - INFO - oe-selftest - OK - All required tests passed (successes=1, skipped=0, failures=0, errors=0)
Best regards,
Stefano
________________________________
From: Mathieu Dubois-Briand <[email protected]>
Sent: Wednesday, November 19, 2025 10:10
To: Stefano Tondo <[email protected]>; [email protected] <[email protected]>
Cc: Marko, Peter (FT D EU SK BFS1) <[email protected]>; Freihofer, Adrian (SI B PRO TI EAC CCP) <[email protected]>; Tondo, Stefano (ext) (SI B PRO AUT PD ZUG SW 2) <[email protected]>
Subject: Re: [OE-core][PATCH v2] spdx30_tasks: Fix SPDX_CUSTOM_ANNOTATION_VARS implementation
[You don't often get email from [email protected]. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
Quoted 18 lines · Stefano Tondo
From: Stefano Tondo <[email protected]>
Fix incorrect function call when processing
SPDX_CUSTOM_ANNOTATION_VARS. The code was callingnew_annotation()as a standalone function, but it should be called as a method on thebuild_objsetobject.Error:
new_annotation(d, build_objset, build, ...)Corrected to:
build_objset.new_annotation(d, build_objset, build, ...)This bug would cause a NameError at runtime if
SPDX_CUSTOM_ANNOTATION_VARSwas set to a non-empty value, preventing SPDX document generation.The fix aligns with how
new_annotation()is called elsewhere in the codebase and matches the SBOMObjset class method signature.
Quoted 8 lines
Signed-off-by Stefano Tondo <[email protected]>---
Changes in v2:
- Fixed test bugs: corrected SPDX file path from packages/ to recipes/
- Fixed test bugs: removed parentheses fromobjset.objects()call
- Fixed whitespace formatting in test code
---
Hi Stefano,
Thanks for the v2, but it looks like the test is still failing with a similar error:
2025-11-18 18:36:56,500 - oe-selftest - INFO - spdx.SPDX30Check.test_custom_annotation_vars (subunit.RemotedTestCase) 2025-11-18 18:36:56,500 - oe-selftest - INFO - ... FAIL
...
File "/srv/pokybuild/yocto-worker/oe-selftest-debian/build/layers/openembedded-core/meta/lib/oeqa/selftest/cases/spdx.py", line 330, in test_custom_annotation_vars
self.assertIsNotNone(build, "Unable to find Build element")
~~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib/python3.13/unittest/case.py", line 1309, in assertIsNotNone
self.fail(self._formatMessage(msg, standardMsg))
~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3.13/unittest/case.py", line 732, in fail
raise self.failureException(msg)
AssertionError: unexpectedly None : Unable to find Build element
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fautobuilder.yoctoproject.org%2Fvalkyrie%2F%23%2Fbuilders%2F35%2Fbuilds%2F2716&data=05%7C02%7Cstefano.tondo.ext%40siemens.com%7C83cc9b25d9d7452d506108de274b8ab2%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C638991402564335644%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=B9xMi%2B%2B5GIZkbxiVsiSQoV5jo8fTB3DlA3rmXnhFszM%3D&reserved=0<https://autobuilder.yoctoproject.org/valkyrie/#/builders/35/builds/2716>
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fautobuilder.yoctoproject.org%2Fvalkyrie%2F%23%2Fbuilders%2F48%2Fbuilds%2F2610&data=05%7C02%7Cstefano.tondo.ext%40siemens.com%7C83cc9b25d9d7452d506108de274b8ab2%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C638991402564365511%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=3l5UUBVMkavU0hHo2YpwJOtuPBeptQ5vl7xVTSdAxUw%3D&reserved=0<https://autobuilder.yoctoproject.org/valkyrie/#/builders/48/builds/2610>
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fautobuilder.yoctoproject.org%2Fvalkyrie%2F%23%2Fbuilders%2F23%2Fbuilds%2F2852&data=05%7C02%7Cstefano.tondo.ext%40siemens.com%7C83cc9b25d9d7452d506108de274b8ab2%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C638991402564383666%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=rWHimLU30QLtBL3q5XZ9%2Blk7UW33hYUb1KRYe0zTO70%3D&reserved=0<https://autobuilder.yoctoproject.org/valkyrie/#/builders/23/builds/2852>
Can you have a look at these?
Thanks,
Mathieu
--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbootlin.com%2F&data=05%7C02%7Cstefano.tondo.ext%40siemens.com%7C83cc9b25d9d7452d506108de274b8ab2%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C638991402564400279%7CUnknown%7CTWFpbGZsb3d8eyJFbXB0eU1hcGkiOnRydWUsIlYiOiIwLjAuMDAwMCIsIlAiOiJXaW4zMiIsIkFOIjoiTWFpbCIsIldUIjoyfQ%3D%3D%7C0%7C%7C%7C&sdata=Mz293oTTsJuVwG6sHJA4mf0Ln6gQsvwhncnbrdz0GUs%3D&reserved=0<https://bootlin.com/>
Quoted 17 lines · Stefano Tondo
Hi Mathieu,
Weird, this time oe-selftest was passing. Anything else I need to check locally to make sure it is working properly?
2025-11-19 12:25:28,520 - oe-selftest - INFO - test_custom_annotation_vars (spdx.SPDX30Check.test_custom_annotation_vars) 2025-11-19 12:26:22,548 - oe-selftest - INFO - Found ANNOTATION1: ANNOTATION1=TestAnnotation1 2025-11-19 12:26:22,548 - oe-selftest - INFO - Found ANNOTATION2: ANNOTATION2=TestAnnotation2 2025-11-19 12:26:22,549 - oe-selftest - INFO - ... ok 2025-11-19 12:26:27,823 - oe-selftest - INFO - ---------------------------------------------------------------------- 2025-11-19 12:26:27,823 - oe-selftest - INFO - Ran 1 test in 59.471s 2025-11-19 12:26:27,823 - oe-selftest - INFO - OK 2025-11-19 12:26:32,996 - oe-selftest - INFO - RESULTS: 2025-11-19 12:26:32,996 - oe-selftest - INFO - RESULTS - spdx.SPDX30Check.test_custom_annotation_vars: PASSED (54.03s) 2025-11-19 12:26:32,997 - oe-selftest - INFO - SUMMARY: 2025-11-19 12:26:32,997 - oe-selftest - INFO - oe-selftest () - Ran 1 test in 59.471s 2025-11-19 12:26:32,997 - oe-selftest - INFO - oe-selftest - OK - All required tests passed (successes=1, skipped=0, failures=0, errors=0)
Quoted 3 lines
Best regards,
Stefano
Hi Stefano,
I was able to reproduce this locally, using:
- oecore: https://git.yoctoproject.org/poky-ci-archive/tag/?h=oecore/autobuilder.yoctoproject.org/valkyrie/a-full-2740
- bitbake: https://git.yoctoproject.org/poky-ci-archive/tag/?h=bitbake/autobuilder.yoctoproject.org/valkyrie/a-full-2740
in local.conf:
MACHINE = "qemux86-64"SANITY_TESTED_DISTROS = ""
An then:
oe-selftest -r spdx.SPDX30Check.test_custom_annotation_vars
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com