[OE-core] [PATCH 20/22] arch-armv7a.inc: fix armv7a-vfp-neon -> armv7a compat case

[Koen Kooi]

Op 1 aug. 2011, om 15:10 heeft Richard Purdie het volgende geschreven:

> On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
>> From: Koen Kooi <koen at dominion.thruhere.net>
>> 
>> 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
>> 
>> The fix might look like it's in the wrong line, but it's only place in the .inc where it works.
>> 
>> Signed-off-by: Koen Kooi <koen at 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..6ac2950 100644
>> --- a/meta/conf/machine/include/arm/arch-armv7a.inc
>> +++ b/meta/conf/machine/include/arm/arch-armv7a.inc
>> @@ -17,7 +17,7 @@ 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-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-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-vfp-neon armv7at2-vfp-neon"
>> +PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a armv7a-vfp-neon armv7at2-vfp-neon"
> 
> Nearly :)
> 
> You need to add it to the PACKAGE_EXTRA_ARCHS_tune-armv7a and
> PACKAGE_EXTRA_ARCHS_tune-armv7at lines.

I tried adding it to those and it didn't show up in 'bitbake -e'. A new try today:

--- 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-vfp testv7a"
 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-vfp armv7at2-vfp testv7at"
 PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a armv7a-vfp-neon armv7at2-vfp-neon"

koen at dominion:/OE/tentacle/sources/openembedded-core/meta$ bitbake -e | grep testv

PACKAGE_ARCHS="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6-vfp armv6t-vfp armv7-vfp armv7t2-vfp armv7a-vfp armv7at2-vfp testv7at armv7a armv7a-vfp-neon armv7at2-vfp-neon beagleboard"
	ipkgarchs="all any noarch arm armv4 armv4t armv5 armv5t armv5-vfp armv5t-vfp armv5e armv5te armv5e-vfp armv5te-vfp armv6-vfp armv6t-vfp armv7-vfp armv7t2-vfp armv7a-vfp armv7at2-vfp testv7at armv7a armv7a-vfp-neon armv7at2-vfp-neon beagleboard"

So it doesn't work in 'armv7a', but it does work in 'armv7at'. I'll send an updated patch.