From 9881cac1ccbb80d87d3da163afe549bac48f29a1 Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Sun, 31 Dec 2023 11:48:02 -0700
Subject: [PATCH] Revert "fsl-dynamic-packagearch: fix MACHINE_SOCARCH
 definition"

This change makes no sense. MACHINE_SOCARCH must include the suffix
that makes the value SOC-specific. Otherwise, errors such as this occur:
```
ERROR: imx-dpu-g2d-2.1.12-r0 do_create_spdx_setscene: Recipe imx-dpu-g2d is trying to install files into a shared area when those files already exist. The files and the manifests listing them are:
  tmp/deploy/spdx/armv8a/packages/libg2d-dev.spdx.json
    (matched in manifest-armv8a-imx-pxp-g2d.create_spdx)
  tmp/deploy/spdx/armv8a/packages/libg2d2.spdx.json
    (matched in manifest-armv8a-imx-pxp-g2d.create_spdx)
```

This reverts commit 6579ce9b77f0036454478b2e07694f7314f97867.
---
 classes/fsl-dynamic-packagearch.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/fsl-dynamic-packagearch.bbclass b/classes/fsl-dynamic-packagearch.bbclass
index a4817e8da..6cb0c0a9f 100644
--- a/classes/fsl-dynamic-packagearch.bbclass
+++ b/classes/fsl-dynamic-packagearch.bbclass
@@ -74,7 +74,7 @@ python __anonymous () {
             d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("THUMB_EXTRA_SOCARCH"))
 }
 
-MACHINE_SOCARCH = "${TUNE_PKGARCH}"
+MACHINE_SOCARCH = "${TUNE_PKGARCH}${MACHINE_SOCARCH_SUFFIX}"
 
 ARM_EXTRA_SOCARCH = "${ARMPKGARCH}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}${MACHINE_SOCARCH_SUFFIX}"
 THUMB_EXTRA_SOCARCH = "${ARMPKGARCH}${ARM_THUMB_SUFFIX}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}${MACHINE_SOCARCH_SUFFIX}"