Patchwork [v2] arch-armv7a.inc: fix armv7a-vfp-neon -> armv7a compat case

login
register
mail settings
Submitter Koen Kooi
Date Aug. 1, 2011, 1:41 p.m.
Message ID <1312206102-16094-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/8967/
State New, archived
Headers show

Comments

Koen Kooi - Aug. 1, 2011, 1:41 p.m.
Without this 'armv7a' is used as TUNE_ARCH but does *not* end up in PACKAGE_EXTRA_ARCHS:

arch all 1
arch any 6
arch noarch 11
arch arm 16
arch armv4 21
arch armv4t 26
arch armv5 31
arch armv5t 36
arch armv5-vfp 41
arch armv5t-vfp 46
arch armv5e 51
arch armv5te 56
arch armv5e-vfp 61
arch armv5te-vfp 66
arch armv6-vfp 71
arch armv6t-vfp 76
arch armv7-vfp 81
arch armv7t2-vfp 86
arch armv7a-vfp 91
arch armv7at2-vfp 96
arch armv7a-vfp-neon 101
arch armv7at2-vfp-neon 106
arch beagleboard 111

Which leads to a failing do_rootfs

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/conf/machine/include/arm/arch-armv7a.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Richard Purdie - Aug. 1, 2011, 1:47 p.m.
On Mon, 2011-08-01 at 15:41 +0200, Koen Kooi wrote:
> Without this 'armv7a' is used as TUNE_ARCH but does *not* end up in PACKAGE_EXTRA_ARCHS:
> 
> arch all 1
> arch any 6
> arch noarch 11
> arch arm 16
> arch armv4 21
> arch armv4t 26
> arch armv5 31
> arch armv5t 36
> arch armv5-vfp 41
> arch armv5t-vfp 46
> arch armv5e 51
> arch armv5te 56
> arch armv5e-vfp 61
> arch armv5te-vfp 66
> arch armv6-vfp 71
> arch armv6t-vfp 76
> arch armv7-vfp 81
> arch armv7t2-vfp 86
> arch armv7a-vfp 91
> arch armv7at2-vfp 96
> arch armv7a-vfp-neon 101
> arch armv7at2-vfp-neon 106
> arch beagleboard 111
> 
> Which leads to a failing do_rootfs
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/conf/machine/include/arm/arch-armv7a.inc |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
> index ce9cee5..704f86b 100644
> --- a/meta/conf/machine/include/arm/arch-armv7a.inc
> +++ b/meta/conf/machine/include/arm/arch-armv7a.inc
> @@ -14,9 +14,9 @@ TUNE_FEATURES_tune-armv7a ?= "armv7a vfp"
>  TUNE_FEATURES_tune-armv7at ?= "armv7a vfp thumb"
>  TUNE_FEATURES_tune-armv7a-neon ?= "armv7a vfp neon"
>  TUNE_FEATURES_tune-armv7at-neon ?= "armv7a vfp neon thumb"
> -PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a-vfp"
> +PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a armv7a-vfp"
>  PACKAGE_EXTRA_ARCHS_tune-armv7a-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-vfp-neon"
> -PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a-vfp armv7at2-vfp"
> +PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a armv7a-vfp armv7at2-vfp"
>  PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-vfp-neon armv7at2-vfp-neon"

I didn't spell it out but you still need the b versions too for the
equivalent lines ;-)

Cheers,

Richard
Koen Kooi - Aug. 1, 2011, 2 p.m.
Op 1 aug. 2011, om 15:47 heeft Richard Purdie het volgende geschreven:

> On Mon, 2011-08-01 at 15:41 +0200, Koen Kooi wrote:
>> Without this 'armv7a' is used as TUNE_ARCH but does *not* end up in PACKAGE_EXTRA_ARCHS:
>> 
>> arch all 1
>> arch any 6
>> arch noarch 11
>> arch arm 16
>> arch armv4 21
>> arch armv4t 26
>> arch armv5 31
>> arch armv5t 36
>> arch armv5-vfp 41
>> arch armv5t-vfp 46
>> arch armv5e 51
>> arch armv5te 56
>> arch armv5e-vfp 61
>> arch armv5te-vfp 66
>> arch armv6-vfp 71
>> arch armv6t-vfp 76
>> arch armv7-vfp 81
>> arch armv7t2-vfp 86
>> arch armv7a-vfp 91
>> arch armv7at2-vfp 96
>> arch armv7a-vfp-neon 101
>> arch armv7at2-vfp-neon 106
>> arch beagleboard 111
>> 
>> Which leads to a failing do_rootfs
>> 
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> ---
>> meta/conf/machine/include/arm/arch-armv7a.inc |    4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
>> index ce9cee5..704f86b 100644
>> --- a/meta/conf/machine/include/arm/arch-armv7a.inc
>> +++ b/meta/conf/machine/include/arm/arch-armv7a.inc
>> @@ -14,9 +14,9 @@ TUNE_FEATURES_tune-armv7a ?= "armv7a vfp"
>> TUNE_FEATURES_tune-armv7at ?= "armv7a vfp thumb"
>> TUNE_FEATURES_tune-armv7a-neon ?= "armv7a vfp neon"
>> TUNE_FEATURES_tune-armv7at-neon ?= "armv7a vfp neon thumb"
>> -PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a-vfp"
>> +PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a armv7a-vfp"
>> PACKAGE_EXTRA_ARCHS_tune-armv7a-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-vfp-neon"
>> -PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a-vfp armv7at2-vfp"
>> +PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a armv7a-vfp armv7at2-vfp"
>> PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-vfp-neon armv7at2-vfp-neon"
> 
> I didn't spell it out but you still need the b versions too for the
> equivalent lines ;-)

Actually, no :) There only is a little endian compat mapping in base.bbclass, so it only makes sense to fix that one. There are no BE v7as in classic OE or in any layer google.com knows about, so let's leave that out.
Richard Purdie - Aug. 1, 2011, 3:49 p.m.
On Mon, 2011-08-01 at 16:00 +0200, Koen Kooi wrote:
> Op 1 aug. 2011, om 15:47 heeft Richard Purdie het volgende geschreven:
> 
> > On Mon, 2011-08-01 at 15:41 +0200, Koen Kooi wrote:
> >> Without this 'armv7a' is used as TUNE_ARCH but does *not* end up in PACKAGE_EXTRA_ARCHS:
> >> 
> >> arch all 1
> >> arch any 6
> >> arch noarch 11
> >> arch arm 16
> >> arch armv4 21
> >> arch armv4t 26
> >> arch armv5 31
> >> arch armv5t 36
> >> arch armv5-vfp 41
> >> arch armv5t-vfp 46
> >> arch armv5e 51
> >> arch armv5te 56
> >> arch armv5e-vfp 61
> >> arch armv5te-vfp 66
> >> arch armv6-vfp 71
> >> arch armv6t-vfp 76
> >> arch armv7-vfp 81
> >> arch armv7t2-vfp 86
> >> arch armv7a-vfp 91
> >> arch armv7at2-vfp 96
> >> arch armv7a-vfp-neon 101
> >> arch armv7at2-vfp-neon 106
> >> arch beagleboard 111
> >> 
> >> Which leads to a failing do_rootfs
> >> 
> >> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> >> ---
> >> meta/conf/machine/include/arm/arch-armv7a.inc |    4 ++--
> >> 1 files changed, 2 insertions(+), 2 deletions(-)
> >> 
> >> diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
> >> index ce9cee5..704f86b 100644
> >> --- a/meta/conf/machine/include/arm/arch-armv7a.inc
> >> +++ b/meta/conf/machine/include/arm/arch-armv7a.inc
> >> @@ -14,9 +14,9 @@ TUNE_FEATURES_tune-armv7a ?= "armv7a vfp"
> >> TUNE_FEATURES_tune-armv7at ?= "armv7a vfp thumb"
> >> TUNE_FEATURES_tune-armv7a-neon ?= "armv7a vfp neon"
> >> TUNE_FEATURES_tune-armv7at-neon ?= "armv7a vfp neon thumb"
> >> -PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a-vfp"
> >> +PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a armv7a-vfp"
> >> PACKAGE_EXTRA_ARCHS_tune-armv7a-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-vfp-neon"
> >> -PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a-vfp armv7at2-vfp"
> >> +PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a armv7a-vfp armv7at2-vfp"
> >> PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-vfp-neon armv7at2-vfp-neon"
> > 
> > I didn't spell it out but you still need the b versions too for the
> > equivalent lines ;-)
> 
> Actually, no :) There only is a little endian compat mapping in
> base.bbclass, so it only makes sense to fix that one. There are no BE
> v7as in classic OE or in any layer google.com knows about, so let's
> leave that out.

Ok, merged to master, thanks.

Richard
Phil Blundell - Aug. 1, 2011, 4 p.m.
On Mon, 2011-08-01 at 15:41 +0200, Koen Kooi wrote:
> diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
> index ce9cee5..704f86b 100644
> --- a/meta/conf/machine/include/arm/arch-armv7a.inc
> +++ b/meta/conf/machine/include/arm/arch-armv7a.inc
> @@ -14,9 +14,9 @@ TUNE_FEATURES_tune-armv7a ?= "armv7a vfp"
>  TUNE_FEATURES_tune-armv7at ?= "armv7a vfp thumb"
>  TUNE_FEATURES_tune-armv7a-neon ?= "armv7a vfp neon"
>  TUNE_FEATURES_tune-armv7at-neon ?= "armv7a vfp neon thumb"
> -PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a-vfp"
> +PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a armv7a-vfp"
>  PACKAGE_EXTRA_ARCHS_tune-armv7a-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-vfp-neon"
> -PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a-vfp armv7at2-vfp"
> +PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a armv7a-vfp armv7at2-vfp"
>  PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-vfp-neon armv7at2-vfp-neon"

Shouldn't this be getting handled in pkgarch_mapping() at the point
where the renaming happens?  In this particular case it seems harmless
(if a bit fragile) to name both possibilities in PACKAGE_EXTRA_ARCHS_...
but I'm not certain that this will always be safe in general.

p.

Patch

diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
index ce9cee5..704f86b 100644
--- a/meta/conf/machine/include/arm/arch-armv7a.inc
+++ b/meta/conf/machine/include/arm/arch-armv7a.inc
@@ -14,9 +14,9 @@  TUNE_FEATURES_tune-armv7a ?= "armv7a vfp"
 TUNE_FEATURES_tune-armv7at ?= "armv7a vfp thumb"
 TUNE_FEATURES_tune-armv7a-neon ?= "armv7a vfp neon"
 TUNE_FEATURES_tune-armv7at-neon ?= "armv7a vfp neon thumb"
-PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a-vfp"
+PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a armv7a-vfp"
 PACKAGE_EXTRA_ARCHS_tune-armv7a-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-vfp-neon"
-PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a-vfp armv7at2-vfp"
+PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a armv7a-vfp armv7at2-vfp"
 PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-vfp-neon armv7at2-vfp-neon"
 
 # VFP Tunes