[PATCH 1/4] multilib.bbclass: allow TARGET_VENDOR_virtclass-multilib to be overriden

[PATCH 1/4] multilib.bbclass: allow TARGET_VENDOR_virtclass-multilib to be overriden

[Matthew McClintock]

If we set this bit, we can override the ugly "pokymllib32" to back to
"poky" (powerpc-pokymllib32-linux-gcc -> powerpc-poky-linux-gcc). I've
left this unset by default, but can be set by adding the following:

TARGET_VENDOR_virtclass-multilib-lib32 = "-poky"

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 meta/classes/multilib.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 87d0cd4..61b7765 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -26,7 +26,8 @@ python multilib_virtclass_handler () {
     e.data.setVar("MLPREFIX", variant + "-")
     e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
     e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant)
-    e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant)
+    if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + variant, False) is None:
+	    e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant)
     e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
 }
 
-- 
1.7.6.1

[PATCH 2/4] bitbake.conf: add default value for TUNE_PKGARCH

[Matthew McClintock]

Add a default value for TUNE_PKGARCH. This let's us use
the following:

TUNE_PKGARCH_tune-ppce500

Instead of scanning over variables and using bitbake internal
functions to create a valid value here.

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 meta/conf/bitbake.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7d0e0d8..e256d5f 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -95,6 +95,7 @@ TUNE_CCARGS ??= ""
 TUNE_LDARGS ??= ""
 TUNE_ASARGS ??= ""
 TUNE_FEATURES ??= "${TUNE_FEATURES_tune-${DEFAULTTUNE}}"
+TUNE_PKGARCH ??= "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
 LIBCEXTENSION ??= ""
 ABIEXTENSION ??= ""
 
-- 
1.7.6.1

[PATCH 3/4] arch-powerpc.inc: use default value of TUNE_PKGARCH

[Matthew McClintock]

We can use the default value for TUNE_PKGARCH, and now we just
append "-nf" if no float is the build target

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 meta/conf/machine/include/powerpc/arch-powerpc.inc |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
index c9b2829..350f9a9 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
@@ -20,8 +20,7 @@ ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-e
 
 PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" , "", "-nf", d)}"
 
-PPCPKGARCH = "${TUNE_ARCH}${PPCPKGSFX_FPU}"
-TUNE_PKGARCH ?= "${PPCPKGARCH}"
+TUNE_PKGARCH_append = "${PPCPKGSFX_FPU}"
 
 # Basic tune definitions
 AVAILTUNES += "powerpc powerpc-nf" 
-- 
1.7.6.1

[PATCH 4/4] tune-ppc*.inc: update to use new default value for TUNE_PKGARCH

[Matthew McClintock]

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 meta/conf/machine/include/tune-ppc603e.inc   |    2 +-
 meta/conf/machine/include/tune-ppce300c2.inc |    2 +-
 meta/conf/machine/include/tune-ppce500.inc   |    2 +-
 meta/conf/machine/include/tune-ppce500mc.inc |    2 +-
 meta/conf/machine/include/tune-ppce500v2.inc |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc
index 663f220..02cebe7 100644
--- a/meta/conf/machine/include/tune-ppc603e.inc
+++ b/meta/conf/machine/include/tune-ppc603e.inc
@@ -4,7 +4,7 @@ require conf/machine/include/powerpc/arch-powerpc.inc
 
 TUNEVALID[ppc603e] = "Enable ppc603e specific processor optimizations"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", "-mcpu=603e", "", d)}"
-TUNE_PKGARCH = "${@bb.utils.contains('TUNE_FEATURES', 'ppc603e', 'ppc603e', '${PPCPKGARCH}', d)}"
+TUNE_PKGARCH_tune-ppc603e = "ppc603e"
 
 AVAILTUNES = "ppc603e"
 TUNE_FEATURES_tune-ppc603e = "m32 fpu-hard ppc603e"
diff --git a/meta/conf/machine/include/tune-ppce300c2.inc b/meta/conf/machine/include/tune-ppce300c2.inc
index bdca1aa..27ef4a8 100644
--- a/meta/conf/machine/include/tune-ppce300c2.inc
+++ b/meta/conf/machine/include/tune-ppce300c2.inc
@@ -4,7 +4,7 @@ require conf/machine/include/powerpc/arch-powerpc.inc
 
 TUNEVALID[ppce300c2] = "Enable ppce300c2 specific processor optimizations"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce300c2", "-mcpu=e300c2", "", d)}"
-TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce300c2", "ppce300c2", "${PPCPKGARCH}", d)}"
+TUNE_PKGARCH_tune-ppce300c2 = "ppce300c2"
 
 AVAILTUNES += "ppce300c2"
 TUNE_FEATURES_tune-ppce300c2 = "m32 fpu-soft ppce300c2"
diff --git a/meta/conf/machine/include/tune-ppce500.inc b/meta/conf/machine/include/tune-ppce500.inc
index 709e14f..1326720 100644
--- a/meta/conf/machine/include/tune-ppce500.inc
+++ b/meta/conf/machine/include/tune-ppce500.inc
@@ -4,7 +4,7 @@ require conf/machine/include/powerpc/arch-powerpc.inc
 
 TUNEVALID[ppce500] = "Enable ppce500 specific processor optimizations"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500", "-mcpu=8540", "", d)}"
-TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce500", "ppce500", "${PPCPKGARCH}", d)}"
+TUNE_PKGARCH_tune-ppce500 = "ppce500"
 
 TUNEVALID[spe] = "Enable SPE ABI extensions"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "spe", "-mabi=spe -mspe", "", d)}"
diff --git a/meta/conf/machine/include/tune-ppce500mc.inc b/meta/conf/machine/include/tune-ppce500mc.inc
index 950c46d..51e6f53 100644
--- a/meta/conf/machine/include/tune-ppce500mc.inc
+++ b/meta/conf/machine/include/tune-ppce500mc.inc
@@ -4,7 +4,7 @@ require conf/machine/include/powerpc/arch-powerpc.inc
 
 TUNEVALID[ppce500mc] = "Enable ppce500mc specific processor optimizations"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "-mcpu=e500mc", "", d)}"
-TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "ppce500mc", "${PPCPKGARCH}", d)}"
+TUNE_PKGARCH_tune-ppce500mc = "ppce500mc"
 
 AVAILTUNES = "ppce500mc"
 TUNE_FEATURES_tune-ppce500mc = "m32 fpu-hard ppce500mc"
diff --git a/meta/conf/machine/include/tune-ppce500v2.inc b/meta/conf/machine/include/tune-ppce500v2.inc
index 0cbe5af..e7b51c6 100644
--- a/meta/conf/machine/include/tune-ppce500v2.inc
+++ b/meta/conf/machine/include/tune-ppce500v2.inc
@@ -4,7 +4,7 @@ require conf/machine/include/powerpc/arch-powerpc.inc
 
 TUNEVALID[ppce500v2] = "Enable ppce500v2 specific processor optimizations"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500v2", "-mcpu=8548", "", d)}"
-TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce500v2", "ppce500v2", "${PPCPKGARCH}", d)}"
+TUNE_PKGARCH_tune-ppce500v2 = "ppce500v2"
 
 TUNEVALID[spe] = "Enable SPE ABI extensions"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "spe", "-mabi=spe -mspe", "", d)}"
-- 
1.7.6.1

Re: [PATCH 3/4] arch-powerpc.inc: use default value of TUNE_PKGARCH

[McClintock Matthew-B29882]

On Mon, Feb 27, 2012 at 1:38 PM, Matthew McClintock <msm@freescale.com> wrote:
> We can use the default value for TUNE_PKGARCH, and now we just
> append "-nf" if no float is the build target
>
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
>  meta/conf/machine/include/powerpc/arch-powerpc.inc |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
> index c9b2829..350f9a9 100644
> --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
> +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
> @@ -20,8 +20,7 @@ ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-e
>
>  PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" , "", "-nf", d)}"

This bit above needs to change too.. we need to reverse the logic:

-PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" ,
"", "-nf", d)}"
+PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft" ,
"-nf", "", d)}"

So for parts with an SPE which define ppc-efd and ppc-efs we don't get
the '-nf' appended (the part this patch adds just below)

-M

> -PPCPKGARCH = "${TUNE_ARCH}${PPCPKGSFX_FPU}"
> -TUNE_PKGARCH ?= "${PPCPKGARCH}"
> +TUNE_PKGARCH_append = "${PPCPKGSFX_FPU}"
>
>  # Basic tune definitions
>  AVAILTUNES += "powerpc powerpc-nf"

Re: [PATCH 3/4] arch-powerpc.inc: use default value of TUNE_PKGARCH

[McClintock Matthew-B29882]

On Mon, Feb 27, 2012 at 3:41 PM, Matthew McClintock <msm@freescale.com> wrote:
> On Mon, Feb 27, 2012 at 1:38 PM, Matthew McClintock <msm@freescale.com> wrote:
>> We can use the default value for TUNE_PKGARCH, and now we just
>> append "-nf" if no float is the build target
>>
>> Signed-off-by: Matthew McClintock <msm@freescale.com>
>> ---
>>  meta/conf/machine/include/powerpc/arch-powerpc.inc |    3 +--
>>  1 files changed, 1 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
>> index c9b2829..350f9a9 100644
>> --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
>> +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
>> @@ -20,8 +20,7 @@ ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-e
>>
>>  PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" , "", "-nf", d)}"
>
> This bit above needs to change too.. we need to reverse the logic:
>
> -PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" ,
> "", "-nf", d)}"
> +PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft" ,
> "-nf", "", d)}"
>
> So for parts with an SPE which define ppc-efd and ppc-efs we don't get
> the '-nf' appended (the part this patch adds just below)

Or perhaps after finding some python/bitbake foo:

PPCPKGSFX_FPU = "${@['', '-nf', '',
'-gnuspe'][bb.data.getVar('TARGET_FPU',d,1) in ['fpu-hard',
'fpu-soft', 'ppc-efs', 'ppc-efd']]}"

-M

Re: [PATCH 1/4] multilib.bbclass: allow TARGET_VENDOR_virtclass-multilib to be overriden

[McClintock Matthew-B29882]

Per conversation with Saul on IRC - I'll push a branch to poky-contrib
for my 6 pending patches.

-M

On Mon, Feb 27, 2012 at 1:38 PM, Matthew McClintock <msm@freescale.com> wrote:
> If we set this bit, we can override the ugly "pokymllib32" to back to
> "poky" (powerpc-pokymllib32-linux-gcc -> powerpc-poky-linux-gcc). I've
> left this unset by default, but can be set by adding the following:
>
> TARGET_VENDOR_virtclass-multilib-lib32 = "-poky"
>
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
>  meta/classes/multilib.bbclass |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
> index 87d0cd4..61b7765 100644
> --- a/meta/classes/multilib.bbclass
> +++ b/meta/classes/multilib.bbclass
> @@ -26,7 +26,8 @@ python multilib_virtclass_handler () {
>     e.data.setVar("MLPREFIX", variant + "-")
>     e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
>     e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant)
> -    e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant)
> +    if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + variant, False) is None:
> +           e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant)
>     e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
>  }
>
> --
> 1.7.6.1
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH 1/4] multilib.bbclass: allow TARGET_VENDOR_virtclass-multilib to be overriden

[Saul Wold]

On 02/27/2012 11:38 AM, Matthew McClintock wrote:
> If we set this bit, we can override the ugly "pokymllib32" to back to
> "poky" (powerpc-pokymllib32-linux-gcc ->  powerpc-poky-linux-gcc). I've
> left this unset by default, but can be set by adding the following:
>
> TARGET_VENDOR_virtclass-multilib-lib32 = "-poky"
>
> Signed-off-by: Matthew McClintock<msm@freescale.com>
> ---
>   meta/classes/multilib.bbclass |    3 ++-
>   1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
> index 87d0cd4..61b7765 100644
> --- a/meta/classes/multilib.bbclass
> +++ b/meta/classes/multilib.bbclass
> @@ -26,7 +26,8 @@ python multilib_virtclass_handler () {
>       e.data.setVar("MLPREFIX", variant + "-")
>       e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
>       e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant)
> -    e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant)
> +    if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + variant, False) is None:
> +	    e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant)
>       e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
>   }
>

Patches 1, 2, and 4 from this series where pulled into OE-core

Thanks	
	Sau!