From 9b574570cabd7387ea14c084e06dac9e7600b6dc Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 9 Oct 2016 19:12:36 +0200 Subject: 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 Signed-off-by: Otavio Salvador --- classes/fsl-dynamic-packagearch.bbclass | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'classes/fsl-dynamic-packagearch.bbclass') 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 () { 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}" -- cgit v1.2.3-54-g00ecf