[meta-freescale] [meta-fsl-arm][PATCH] fsl-dynamic-packagearch: add all possible MACHINE_SOCARCH feeds to PACKAGE_EXTRA_ARCHS
Max Krummenacher
max.oss.09 at gmail.com
Sun Oct 9 10:12:36 PDT 2016
This ensures that all possible MACHINE_SOCARCH feeds are part of PACKAGE_EXTRA_ARCHS.
For ARM, dependent on the instruction set we can have two MACHINE_SOCARCHs
e.g. armv7ahf-vfp-neon-mx6qdl armv7at2hf-vfp-neon-mx6qdl
so we must put both into PACKAGE_EXTRA_ARCHS. Otherwise a image recipe will
only find packages from one of the two PACKAGE_EXTRA_ARCHS.
(this reimplements commit bfe01a0ebde407086f4a7710ea165c6beff310d7)
Signed-off-by: Max Krummenacher <max.krummenacher at toradex.com>
---
classes/fsl-dynamic-packagearch.bbclass | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/classes/fsl-dynamic-packagearch.bbclass b/classes/fsl-dynamic-packagearch.bbclass
index 95ea775..ddb1673 100644
--- a/classes/fsl-dynamic-packagearch.bbclass
+++ b/classes/fsl-dynamic-packagearch.bbclass
@@ -53,6 +53,17 @@ python __anonymous () {
machine_socarch = (d.getVar("MACHINE_SOCARCH", True) or "")
if not machine_socarch in cur_package_archs:
d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % machine_socarch)
+
+ if d.getVar("TUNE_ARCH", True) == "arm":
+ # For ARM we have two possible machine_socarch values, one for the arm and one for the thumb instruction set
+ # add the other value to extra archs also, so that a image recipe searches both for packages.
+ if d.getVar("ARM_INSTRUCTION_SET", True) == "thumb":
+ d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("ARM_EXTRA_SOCARCH", True))
+ else:
+ d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("THUMB_EXTRA_SOCARCH", True))
}
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}"
--
2.6.6
More information about the meta-freescale
mailing list