diff options
| author | Tom Hochstein <tom.hochstein@nxp.com> | 2023-12-31 11:48:02 -0700 |
|---|---|---|
| committer | Tom Hochstein <tom.hochstein@nxp.com> | 2023-12-31 11:48:02 -0700 |
| commit | 9881cac1ccbb80d87d3da163afe549bac48f29a1 (patch) | |
| tree | e4b6d62c7011fb49e2255cc6aa06b1bc2a6af1a9 /classes | |
| parent | 87890e7074aab4697b2a2e3ec9dc53bae9bc4580 (diff) | |
| download | meta-freescale-9881cac1ccbb80d87d3da163afe549bac48f29a1.tar.gz | |
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.
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/fsl-dynamic-packagearch.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/fsl-dynamic-packagearch.bbclass b/classes/fsl-dynamic-packagearch.bbclass index a4817e8d..6cb0c0a9 100644 --- a/classes/fsl-dynamic-packagearch.bbclass +++ b/classes/fsl-dynamic-packagearch.bbclass | |||
| @@ -74,7 +74,7 @@ python __anonymous () { | |||
| 74 | d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("THUMB_EXTRA_SOCARCH")) | 74 | d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("THUMB_EXTRA_SOCARCH")) |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | MACHINE_SOCARCH = "${TUNE_PKGARCH}" | 77 | MACHINE_SOCARCH = "${TUNE_PKGARCH}${MACHINE_SOCARCH_SUFFIX}" |
| 78 | 78 | ||
| 79 | ARM_EXTRA_SOCARCH = "${ARMPKGARCH}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}${MACHINE_SOCARCH_SUFFIX}" | 79 | ARM_EXTRA_SOCARCH = "${ARMPKGARCH}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}${MACHINE_SOCARCH_SUFFIX}" |
| 80 | THUMB_EXTRA_SOCARCH = "${ARMPKGARCH}${ARM_THUMB_SUFFIX}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}${MACHINE_SOCARCH_SUFFIX}" | 80 | THUMB_EXTRA_SOCARCH = "${ARMPKGARCH}${ARM_THUMB_SUFFIX}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}${MACHINE_SOCARCH_SUFFIX}" |