vcontainer-tarball: fix PACKAGE_ARCH for SPDX do_create_spdx

PACKAGE_ARCH must be "${SDK_ARCH}-${SDKPKGSUFFIX}" (e.g. x86_64-nativesdk)
to match the pattern explicitly listed in SSTATE_ARCHS in
meta/classes-global/sstate.bbclass.

do_create_recipe_spdx writes the static SPDX document under
  DEPLOY_DIR_SPDX/${SSTATE_PKGARCH}/static/

where SSTATE_PKGARCH = PACKAGE_ARCH.  do_create_spdx then calls
find_jsonld() which searches only the arch directories listed in
SPDX_MULTILIB_SSTATE_ARCHS (derived from SSTATE_ARCHS via
all_multilib_tune_values).

The previous value "${SDK_ARCH}_${SDK_OS}" evaluates to "x86_64_linux"
which is NOT listed in SSTATE_ARCHS, so the static document was written
to a directory never searched, causing the fatal:

  ERROR: Could not find a static SPDX document named static-vcontainer-tarball

The correct value "${SDK_ARCH}-${SDKPKGSUFFIX}" evaluates to
"x86_64-nativesdk" which IS listed in SSTATE_ARCHS as the literal
"${SDK_ARCH}-${SDKPKGSUFFIX}" entry, and matches the pattern used by
buildtools-tarball.bb (the reference for host-only SDK tarballs with
TARGET_ARCH = "none" / TARGET_OS = "none").

Signed-off-by: Tim Orling <tim.orling@konsulko.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/recipes-containers/vcontainer/vcontainer-tarball.bb b/recipes-containers/vcontainer/vcontainer-tarball.bb
index ee3c1147..ed9b8e13 100644
--- a/recipes-containers/vcontainer/vcontainer-tarball.bb
+++ b/recipes-containers/vcontainer/vcontainer-tarball.bb
@@ -50,6 +50,15 @@ TOOLCHAIN_TARGET_TASK = ""
 TARGET_ARCH = "none"
 TARGET_OS = "none"
 
+# Must use ${SDK_ARCH}-${SDKPKGSUFFIX} (e.g. x86_64-nativesdk) to match
+# the pattern explicitly listed in SSTATE_ARCHS, which SPDX's find_jsonld()
+# searches when locating the static recipe SPDX document generated by
+# do_create_recipe_spdx.  Using ${SDK_ARCH}_${SDK_OS} (x86_64_linux) is NOT
+# in SSTATE_ARCHS and causes do_create_spdx to fatal with "Could not find a
+# static SPDX document named static-vcontainer-tarball".
+# See: meta/classes-global/sstate.bbclass SSTATE_ARCHS definition and
+#      buildtools-tarball.bb for the reference pattern.
+
 # Host tools to include via SDK
 # Note: nativesdk-qemu-vcontainer is a minimal QEMU without OpenGL/virgl
 # to avoid mesa -> llvm -> clang build dependency chain
@@ -66,7 +75,7 @@ SDK_TITLE = "vcontainer tools (vdkr/vpdmn)"
 
 # SDK configuration (same pattern as buildtools-tarball)
 MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"
-PACKAGE_ARCH = "${SDK_ARCH}_${SDK_OS}"
+PACKAGE_ARCH = "${SDK_ARCH}-${SDKPKGSUFFIX}"
 PACKAGE_ARCHS = ""
 SDK_PACKAGE_ARCHS += "vcontainer-dummy-${SDKPKGSUFFIX}"