From bfe01a0ebde407086f4a7710ea165c6beff310d7 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 30 Mar 2015 23:49:32 +0200 Subject: fsl-dynamic-packagearch: add all MACHINE_SOCARCH feeds This ensures that all MACHINE_SOCARCH feeds are part of PACKAGE_EXTRA_ARCHS. oe-core now puts packages into feed dirs dependent on the used instruction sets. http://cgit.openembedded.org/openembedded-core/commit/?id=3e760031f91fb87c3e2f62b77a117eb41164f259 This is true also for packages in MACHINE_SOCARCH, i.e. we get in deploy/ipk for an angstrom based build: armv7ahf-vfp-neon-mx6qdl armv7at2hf-vfp-neon-mx6qdl so we must put both into PACKAGE_EXTRA_ARCHS. TUNE_FEATURES defines if arm and/or thumb feeds are possible with the current configuration. Change-Id: I47ed7c3a5cbdc488801cd9198e822f9845565559 Signed-off-by: Max Krummenacher Signed-off-by: Otavio Salvador --- classes/fsl-dynamic-packagearch.bbclass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/fsl-dynamic-packagearch.bbclass b/classes/fsl-dynamic-packagearch.bbclass index 40eae6c..3e1faf4 100644 --- a/classes/fsl-dynamic-packagearch.bbclass +++ b/classes/fsl-dynamic-packagearch.bbclass @@ -16,7 +16,7 @@ # # To use the class, specify, for example: # -# MACHINE_SOCARCH_soc = "${TUNE_PKGARCH}-soc" +# MACHINE_SOCARCH_SUFFIX_soc = "-soc" # # and the need filters, as: # @@ -45,3 +45,11 @@ python __anonymous () { bb.debug(1, "Use '%s' as package archictecture for '%s'" % (package_arch, PN)) d.setVar("PACKAGE_ARCH", package_arch) } + +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}" + +PACKAGE_EXTRA_ARCHS_append = " ${@bb.utils.contains('TUNE_FEATURES', 'arm', '${ARM_EXTRA_SOCARCH}', '', d) } \ + ${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${THUMB_EXTRA_SOCARCH}', '', d) }" + +MACHINE_SOCARCH = "${@bb.utils.contains('ARM_INSTRUCTION_SET', 'thumb', '${THUMB_EXTRA_SOCARCH}', '${ARM_EXTRA_SOCARCH}', d)}" -- cgit v1.2.3-54-g00ecf