[meta-freescale] [meta-freescale PATCH v2 1/2] fsl-dynamic-packagearch.bbclass: Stop using ARM-specific architectures

[Max Krummenacher]

Hi

2016-09-21 13:16 GMT+02:00 Otavio Salvador <otavio at ossystems.com.br>:
> The code to dynamically assign the architecture does take into account
> the default tune so we don't need to include the other architectures
> with the SoC suffix into the possible package architecture list.
>
> This allow for the class to be used across different architectures
> (such as PowerPC) thus fixing issues while integrating it for QorIQ
> usage.
>
> Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
> ---
>

This does now break certain ARM configurations.

If one configures a build to use thumb by default then the all
packages which don't explicitly override the instruction set are built
for thumb and put into the THUMB-SOCARCH while the others are put into
ARM-SOCARCH.

If not both archs are added to PACKAGE_EXTRA_ARCHS then image creation
fails because all packages in ARM-SOCARCH are not found.

See also the original patch:
https://patchwork.openembedded.org/patch/91049/

How can I reproduce the PowerPC use case when preparing a patch?
I guess just reverting the patch will make someone else unhappy.

Max

> Changes in v2:
> - New patch
>
>  classes/fsl-dynamic-packagearch.bbclass | 17 +++++------------
>  1 file changed, 5 insertions(+), 12 deletions(-)
>
> diff --git a/classes/fsl-dynamic-packagearch.bbclass b/classes/fsl-dynamic-packagearch.bbclass
> index fa542fc..95ea775 100644
> --- a/classes/fsl-dynamic-packagearch.bbclass
> +++ b/classes/fsl-dynamic-packagearch.bbclass
> @@ -23,7 +23,7 @@
>  # MACHINE_ARCH_FILTER = "virtual/kernel"
>  # MACHINE_SOCARCH_FILTER_soc = "virtual/libgles1 ... virtual/libgl"
>  #
> -# Copyright 2013-2015 (C) O.S. Systems Software LTDA.
> +# Copyright 2013-2016 (C) O.S. Systems Software LTDA.
>
>  python __anonymous () {
>      machine_arch_filter = set((d.getVar("MACHINE_ARCH_FILTER", True) or "").split())
> @@ -50,16 +50,9 @@ python __anonymous () {
>              d.setVar("PACKAGE_ARCH", package_arch)
>
>      cur_package_archs = (d.getVar("PACKAGE_ARCHS", True) or "").split()
> -    arch_extra_socarch = (d.getVar("ARM_EXTRA_SOCARCH", True) or "")
> -    thumb_extra_socarch = (d.getVar("THUMB_EXTRA_SOCARCH", True) or "")
> -    if not arch_extra_socarch in cur_package_archs:
> -        d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % arch_extra_socarch)
> -
> -    if not thumb_extra_socarch in cur_package_archs:
> -        d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % thumb_extra_socarch)
> +    machine_socarch = (d.getVar("MACHINE_SOCARCH", True) or "")
> +    if not machine_socarch in cur_package_archs:
> +        d.appendVar("PACKAGE_EXTRA_ARCHS", " %s" % machine_socarch)
>  }
>
> -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}"
> -
> -MACHINE_SOCARCH = "${@bb.utils.contains('ARM_INSTRUCTION_SET', 'thumb', '${THUMB_EXTRA_SOCARCH}', '${ARM_EXTRA_SOCARCH}', d)}"
> +MACHINE_SOCARCH = "${TUNE_PKGARCH}${MACHINE_SOCARCH_SUFFIX}"
> --
> 2.9.3
>
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale