devtool-source: set S variable to a sub dir of UNPACKDIR
PATCH 1/1 devtool-source: set S variable to a sub dir of UNPACKDIR
If a recipe set UNPACKDIR to a directory that is not contained within WORKDIR, before this modification, this generates the following error:
"S should be set relative to UNPACKDIR."
S should not be updated, otherwise the recipe may not find the extracted sources. In all recipes, S should reference the UNPACKDIR variable. There is an exception for the kernel to prevent infinite recursion when expanding the STAGING_KERNEL_DIR variable.
So, only updates UNPACKDIR to be within the DEVTOOL_TEMPDIR directory.
---
I have done various testing, but since I don't know all the requirements of devtool, and all the impacts of this change, I may have broken some stuff (I hope not).
This patch fixes the following command:
- devtool upgrade sbom-cve-check-update-cvelist-native
It does not break the following commands:
- devtool upgrade linux-yocto
- devtool upgrade python3-sbom-cve-check
--- meta/classes/devtool-source.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
meta/classes/devtool-source.bbclass +2 -3
@@ -37,12 +37,11 @@ python() { workdir = os.path.join(tempdir, 'workdir') d.setVar('WORKDIR', workdir) if not d.getVar('S').startswith(workdir): + d.setVar('UNPACKDIR', os.path.join(workdir, 'sources')) # Usually a shared workdir recipe (kernel, gcc) # Try to set a reasonable default if bb.data.inherits_class('kernel', d): - d.setVar('S', '${WORKDIR}/source') - else: - d.setVar('S', '${WORKDIR}/%s' % os.path.basename(d.getVar('S'))) + d.setVar('S', '${UNPACKDIR}/source') if bb.data.inherits_class('kernel', d): # We don't want to move the source to STAGING_KERNEL_DIR here d.setVar('STAGING_KERNEL_DIR', '${S}')
---
base-commit: 8b5f530fc57ba0e04c47b2d7338f5c0f862b084f
change-id: 20260416-fix-devtool-source-a76f6eb22c11
Best regards,
Signature · 1 line
Benjamin Robin (Schneider Electric) <[email protected]>
Quoted 17 lines · Benjamin Robin (Schneider Electric)
If a recipe set UNPACKDIR to a directory that is not contained within WORKDIR, before this modification, this generates the following error:
"S should be set relative to UNPACKDIR."S should not be updated, otherwise the recipe may not find the extracted sources. In all recipes, S should reference the UNPACKDIR variable. There is an exception for the kernel to prevent infinite recursion when expanding the
STAGING_KERNEL_DIRvariable.So, only updates UNPACKDIR to be within the
DEVTOOL_TEMPDIRdirectory.Signed-off-by Benjamin Robin (Schneider Electric) <[email protected]>---
I have done various testing, but since I don't know all the requirements of devtool, and all the impacts of this change, I may have broken some stuff (I hope not).
Quoted 6 lines
This patch fixes the following command:
- devtool upgrade sbom-cve-check-update-cvelist-nativeIt does not break the following commands:
- devtool upgrade linux-yocto
- devtool upgrade python3-sbom-cve-check
For reference devtool has a strong test suite and you can run it with "oe-selftest -r devtool".
Cheers,
Richard