[PATCH 1/2] opkg-utils: Add RPROVIDES/RREPLACES/RCONFLICTS to fix upgrade-path

[PATCH 1/2] opkg-utils: Add RPROVIDES/RREPLACES/RCONFLICTS to fix upgrade-path

[Martin Jansa]

* now with update-alternatives-cworth completely gone should correctly
  replace it on target as well

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 80efa8f..c2509c4 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -28,6 +28,8 @@ do_install() {
 
 PACKAGES =+ "update-alternatives-opkg"
 FILES_update-alternatives-opkg = "${bindir}/update-alternatives"
-RPROVIDES_update-alternatives-opkg = "update-alternatives"
+RPROVIDES_update-alternatives-opkg = "update-alternatives update-alternatives-cworth"
+RREPLACES_update-alternatives-opkg = "update-alternatives-cworth"
+RCONFLICTS_update-alternatives-opkg = "update-alternatives-cworth"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
1.8.5.3

[PATCH 2/2] feature-arm-thumb: Fix missing t2 suffix for armv7a MACHINEs

[Martin Jansa]

* unfortunatelly that note about armv7 matching also armv7a is no
  longer valid since armv7 include in armv7 was replaced with
  armv6+neon in this commit:

  commit 75b8adbc042e0f65fb1286bc550d02becd3b6aea
  Author: Khem Raj <raj.khem@gmail.com>
  Date:   Tue Mar 27 18:37:45 2012 -0700

    tune/armv7: Delete

  since then thumb and arm feeds had the same architecture
* be aware that this will rename lots of feeds

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/conf/machine/include/arm/feature-arm-thumb.inc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
index bd754be..fa3a4e5 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -9,11 +9,10 @@ ARM_THUMB_M_OPT = "${@['-marm', '-mthumb'][d.getVar('ARM_INSTRUCTION_SET', True)
 TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", " ${ARM_THUMB_M_OPT}", "", d)}"
 OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}"
 
-# Note armv7 will hit on armv7a as well
 ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv4", "thumb" ], "t", "", d)}"
 ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "thumb" ], "t", "", d)}"
 ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv6", "thumb" ], "t", "", d)}"
-ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv7", "thumb" ], "t2", "", d)}"
+ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv7a", "thumb" ], "t2", "", d)}"
 
 # Whether to compile with code to allow interworking between the two
 # instruction sets. This allows thumb code to be executed on a primarily
-- 
1.8.5.3

Re: [PATCH 2/2] feature-arm-thumb: Fix missing t2 suffix for armv7a MACHINEs

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2699 bytes --]

On Wed, Jan 22, 2014 at 12:43:12AM +0100, Martin Jansa wrote:
> * unfortunatelly that note about armv7 matching also armv7a is no
>   longer valid since armv7 include in armv7 was replaced with
>   armv6+neon in this commit:
> 
>   commit 75b8adbc042e0f65fb1286bc550d02becd3b6aea
>   Author: Khem Raj <raj.khem@gmail.com>
>   Date:   Tue Mar 27 18:37:45 2012 -0700
> 
>     tune/armv7: Delete
> 
>   since then thumb and arm feeds had the same architecture
> * be aware that this will rename lots of feeds

Can someone confirm that t2 should be included for armv7m or armv7r?

It looks like armv7m definitely should include it, but it doesn't even have
thumb in TUNE_FEATURES for the only armv7m user we have in oe-core cortexm3:

tune-cortexm3.inc:TUNE_FEATURES_tune-cortexm3 = "armv7m vfp cortexm3"
tune-cortexm3.inc:PACKAGE_EXTRA_ARCHS_tune-cortexm3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7m-vfp"

tune-cortexr4.inc:TUNE_FEATURES_tune-cortexr4 = "armv7r vfp cortexr4"
tune-cortexr4.inc:PACKAGE_EXTRA_ARCHS_tune-cortexr4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7r-vfp"

Anyway I'm sending a bit bigger RFC/WIP patchset to address this.

> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/conf/machine/include/arm/feature-arm-thumb.inc | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
> index bd754be..fa3a4e5 100644
> --- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
> +++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
> @@ -9,11 +9,10 @@ ARM_THUMB_M_OPT = "${@['-marm', '-mthumb'][d.getVar('ARM_INSTRUCTION_SET', True)
>  TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", " ${ARM_THUMB_M_OPT}", "", d)}"
>  OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}"
>  
> -# Note armv7 will hit on armv7a as well
>  ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv4", "thumb" ], "t", "", d)}"
>  ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "thumb" ], "t", "", d)}"
>  ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv6", "thumb" ], "t", "", d)}"
> -ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv7", "thumb" ], "t2", "", d)}"
> +ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv7a", "thumb" ], "t2", "", d)}"
>  
>  # Whether to compile with code to allow interworking between the two
>  # instruction sets. This allows thumb code to be executed on a primarily
> -- 
> 1.8.5.3
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 2/2] feature-arm-thumb: Fix missing t2 suffix for armv7a MACHINEs

[Koen Kooi]

Op 22 jan. 2014, om 01:49 heeft Martin Jansa <martin.jansa@gmail.com> het volgende geschreven:

> On Wed, Jan 22, 2014 at 12:43:12AM +0100, Martin Jansa wrote:
>> * unfortunatelly that note about armv7 matching also armv7a is no
>>  longer valid since armv7 include in armv7 was replaced with
>>  armv6+neon in this commit:
>> 
>>  commit 75b8adbc042e0f65fb1286bc550d02becd3b6aea
>>  Author: Khem Raj <raj.khem@gmail.com>
>>  Date:   Tue Mar 27 18:37:45 2012 -0700
>> 
>>    tune/armv7: Delete
>> 
>>  since then thumb and arm feeds had the same architecture
>> * be aware that this will rename lots of feeds
> 
> Can someone confirm that t2 should be included for armv7m or armv7r?

cortex-M is thumb2 only, no idea about cortex-r.

regards,

Koen

> 
> It looks like armv7m definitely should include it, but it doesn't even have
> thumb in TUNE_FEATURES for the only armv7m user we have in oe-core cortexm3:
> 
> tune-cortexm3.inc:TUNE_FEATURES_tune-cortexm3 = "armv7m vfp cortexm3"
> tune-cortexm3.inc:PACKAGE_EXTRA_ARCHS_tune-cortexm3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7m-vfp"
> 
> tune-cortexr4.inc:TUNE_FEATURES_tune-cortexr4 = "armv7r vfp cortexr4"
> tune-cortexr4.inc:PACKAGE_EXTRA_ARCHS_tune-cortexr4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7r-vfp"
> 
> Anyway I'm sending a bit bigger RFC/WIP patchset to address this.
> 
>> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
>> ---
>> meta/conf/machine/include/arm/feature-arm-thumb.inc | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>> 
>> diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
>> index bd754be..fa3a4e5 100644
>> --- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
>> +++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
>> @@ -9,11 +9,10 @@ ARM_THUMB_M_OPT = "${@['-marm', '-mthumb'][d.getVar('ARM_INSTRUCTION_SET', True)
>> TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", " ${ARM_THUMB_M_OPT}", "", d)}"
>> OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}"
>> 
>> -# Note armv7 will hit on armv7a as well
>> ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv4", "thumb" ], "t", "", d)}"
>> ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "thumb" ], "t", "", d)}"
>> ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv6", "thumb" ], "t", "", d)}"
>> -ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv7", "thumb" ], "t2", "", d)}"
>> +ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv7a", "thumb" ], "t2", "", d)}"
>> 
>> # Whether to compile with code to allow interworking between the two
>> # instruction sets. This allows thumb code to be executed on a primarily
>> -- 
>> 1.8.5.3
>> 
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 2/2] feature-arm-thumb: Fix missing t2 suffix for armv7a MACHINEs

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3520 bytes --]

On Wed, Jan 22, 2014 at 07:43:19AM +0100, Koen Kooi wrote:
> 
> Op 22 jan. 2014, om 01:49 heeft Martin Jansa <martin.jansa@gmail.com> het volgende geschreven:
> 
> > On Wed, Jan 22, 2014 at 12:43:12AM +0100, Martin Jansa wrote:
> >> * unfortunatelly that note about armv7 matching also armv7a is no
> >>  longer valid since armv7 include in armv7 was replaced with
> >>  armv6+neon in this commit:
> >> 
> >>  commit 75b8adbc042e0f65fb1286bc550d02becd3b6aea
> >>  Author: Khem Raj <raj.khem@gmail.com>
> >>  Date:   Tue Mar 27 18:37:45 2012 -0700
> >> 
> >>    tune/armv7: Delete
> >> 
> >>  since then thumb and arm feeds had the same architecture
> >> * be aware that this will rename lots of feeds
> > 
> > Can someone confirm that t2 should be included for armv7m or armv7r?
> 
> cortex-M is thumb2 only, no idea about cortex-r.

Thanks.

From
http://www.arm.com/products/processors/cortex-r/cortex-r4.php

it looks like r4 should support both, I've addressed that in following
RFC/WIP.

> > It looks like armv7m definitely should include it, but it doesn't even have
> > thumb in TUNE_FEATURES for the only armv7m user we have in oe-core cortexm3:
> > 
> > tune-cortexm3.inc:TUNE_FEATURES_tune-cortexm3 = "armv7m vfp cortexm3"
> > tune-cortexm3.inc:PACKAGE_EXTRA_ARCHS_tune-cortexm3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7m-vfp"
> > 
> > tune-cortexr4.inc:TUNE_FEATURES_tune-cortexr4 = "armv7r vfp cortexr4"
> > tune-cortexr4.inc:PACKAGE_EXTRA_ARCHS_tune-cortexr4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7r-vfp"
> > 
> > Anyway I'm sending a bit bigger RFC/WIP patchset to address this.
> > 
> >> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> >> ---
> >> meta/conf/machine/include/arm/feature-arm-thumb.inc | 3 +--
> >> 1 file changed, 1 insertion(+), 2 deletions(-)
> >> 
> >> diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
> >> index bd754be..fa3a4e5 100644
> >> --- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
> >> +++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
> >> @@ -9,11 +9,10 @@ ARM_THUMB_M_OPT = "${@['-marm', '-mthumb'][d.getVar('ARM_INSTRUCTION_SET', True)
> >> TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", " ${ARM_THUMB_M_OPT}", "", d)}"
> >> OVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}"
> >> 
> >> -# Note armv7 will hit on armv7a as well
> >> ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv4", "thumb" ], "t", "", d)}"
> >> ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "thumb" ], "t", "", d)}"
> >> ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv6", "thumb" ], "t", "", d)}"
> >> -ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv7", "thumb" ], "t2", "", d)}"
> >> +ARMPKGSFX_THUMB .= "${@bb.utils.contains("TUNE_FEATURES", [ "armv7a", "thumb" ], "t2", "", d)}"
> >> 
> >> # Whether to compile with code to allow interworking between the two
> >> # instruction sets. This allows thumb code to be executed on a primarily
> >> -- 
> >> 1.8.5.3
> >> 
> > 
> > -- 
> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> 

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]