summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorMax Krummenacher <max.oss.09@gmail.com>2016-10-09 19:12:36 +0200
committerOtavio Salvador <otavio@ossystems.com.br>2016-10-18 16:26:14 -0200
commit9b574570cabd7387ea14c084e06dac9e7600b6dc (patch)
treeacbc5a4ce24a8f17f3c4a33ad5c2c4dead4b8b5a /classes
parent85a5ee8ae14720c0e6ebdade1de9b29451d9e68b (diff)
downloadmeta-freescale-9b574570cabd7387ea14c084e06dac9e7600b6dc.tar.gz
fsl-dynamic-packagearch: add all possible MACHINE_SOCARCH feeds to PACKAGE_EXTRA_ARCHS
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 44ca1bf2637ed5173ea4b66f6caa4d09eb8eeb76) Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'classes')
-rw-r--r--classes/fsl-dynamic-packagearch.bbclass11
1 files changed, 11 insertions, 0 deletions
diff --git a/classes/fsl-dynamic-packagearch.bbclass b/classes/fsl-dynamic-packagearch.bbclass
index 95ea7757..ddb1673f 100644
--- a/classes/fsl-dynamic-packagearch.bbclass
+++ b/classes/fsl-dynamic-packagearch.bbclass
@@ -53,6 +53,17 @@ python __anonymous () {
53 machine_socarch = (d.getVar("MACHINE_SOCARCH", True) or "") 53 machine_socarch = (d.getVar("MACHINE_SOCARCH", True) or "")
54 if not machine_socarch in cur_package_archs: 54 if not machine_socarch in cur_package_archs:
55 d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % machine_socarch) 55 d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % machine_socarch)
56
57 if d.getVar("TUNE_ARCH", True) == "arm":
58 # For ARM we have two possible machine_socarch values, one for the arm and one for the thumb instruction set
59 # add the other value to extra archs also, so that a image recipe searches both for packages.
60 if d.getVar("ARM_INSTRUCTION_SET", True) == "thumb":
61 d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("ARM_EXTRA_SOCARCH", True))
62 else:
63 d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % d.getVar("THUMB_EXTRA_SOCARCH", True))
56} 64}
57 65
58MACHINE_SOCARCH = "${TUNE_PKGARCH}${MACHINE_SOCARCH_SUFFIX}" 66MACHINE_SOCARCH = "${TUNE_PKGARCH}${MACHINE_SOCARCH_SUFFIX}"
67
68ARM_EXTRA_SOCARCH = "${ARMPKGARCH}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}${MACHINE_SOCARCH_SUFFIX}"
69THUMB_EXTRA_SOCARCH = "${ARMPKGARCH}${ARM_THUMB_SUFFIX}${ARMPKGSFX_DSP}${ARMPKGSFX_EABI}${ARMPKGSFX_ENDIAN}${ARMPKGSFX_FPU}${MACHINE_SOCARCH_SUFFIX}"