[PATCH] mesa: Add blank r600 PACKAGECONFIG

[PATCH] mesa: Add blank r600 PACKAGECONFIG

[Drew Moseley]

Fixes warnings such as:
    WARNING: mesa: invalid PACKAGECONFIG: r600
when building with the r600 configuration.

Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
---
 meta/recipes-graphics/mesa/mesa.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 97ed02f..09e80e8 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -53,6 +53,7 @@ PACKAGECONFIG[openvg] = "--enable-openvg, --disable-openvg"
 
 GALLIUMDRIVERS = "swrast"
 GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}"
+PACKAGECONFIG[r600] = ""
 GALLIUMDRIVERS_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}"
 GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
 GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
-- 
1.9.1

Re: [PATCH] mesa: Add blank r600 PACKAGECONFIG

[Martin Jansa]

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

On Mon, Jun 29, 2015 at 02:23:50PM -0400, Drew Moseley wrote:
> Fixes warnings such as:
>     WARNING: mesa: invalid PACKAGECONFIG: r600
> when building with the r600 configuration.

Shouldn't you fix your PACKAGECONFIG value instead (wherever it's set to
include r600)?

> 
> Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
> ---
>  meta/recipes-graphics/mesa/mesa.inc | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
> index 97ed02f..09e80e8 100644
> --- a/meta/recipes-graphics/mesa/mesa.inc
> +++ b/meta/recipes-graphics/mesa/mesa.inc
> @@ -53,6 +53,7 @@ PACKAGECONFIG[openvg] = "--enable-openvg, --disable-openvg"
>  
>  GALLIUMDRIVERS = "swrast"
>  GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}"
> +PACKAGECONFIG[r600] = ""
>  GALLIUMDRIVERS_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}"
>  GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
>  GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> 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: 188 bytes --]

Re: [PATCH] mesa: Add blank r600 PACKAGECONFIG

[Moseley, Drew]

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


> On Jun 29, 2015, at 3:32 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> 
> On Mon, Jun 29, 2015 at 02:23:50PM -0400, Drew Moseley wrote:
>> Fixes warnings such as:
>>    WARNING: mesa: invalid PACKAGECONFIG: r600
>> when building with the r600 configuration.
> 
> Shouldn't you fix your PACKAGECONFIG value instead (wherever it's set to
> include r600)?

It’s very possible that this is not the best solution for the warning.  The line that sets the GALLIUMDRIVERS_LLVM33 variable right above the line I added is ultimately what I’m trying to have behave properly.  Previously setting PACKAGECONFIG+=“r600” was sufficient to enable this setting but with commit hash c2cbe0f60e6d19ab9a8321be74d636d2c36671a8 this now throws a warning.  Any suggestions for a cleaner solution?

Drew

> 
>> 
>> Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
>> ---
>> meta/recipes-graphics/mesa/mesa.inc | 1 +
>> 1 file changed, 1 insertion(+)
>> 
>> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
>> index 97ed02f..09e80e8 100644
>> --- a/meta/recipes-graphics/mesa/mesa.inc
>> +++ b/meta/recipes-graphics/mesa/mesa.inc
>> @@ -53,6 +53,7 @@ PACKAGECONFIG[openvg] = "--enable-openvg, --disable-openvg"
>> 
>> GALLIUMDRIVERS = "swrast"
>> GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}"
>> +PACKAGECONFIG[r600] = ""
>> GALLIUMDRIVERS_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}"
>> GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
>> GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
>> --
>> 1.9.1
>> 
>> --
>> _______________________________________________
>> 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: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 202 bytes --]

Re: [PATCH] mesa: Add blank r600 PACKAGECONFIG

[Burton, Ross]

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

On 29 June 2015 at 20:44, Moseley, Drew <drew_moseley@mentor.com> wrote:

> It’s very possible that this is not the best solution for the warning.
> The line that sets the GALLIUMDRIVERS_LLVM33 variable right above the line
> I added is ultimately what I’m trying to have behave properly.  Previously
> setting PACKAGECONFIG+=“r600” was sufficient to enable this setting but
> with commit hash c2cbe0f60e6d19ab9a8321be74d636d2c36671a8 this now throws a
> warning.  Any suggestions for a cleaner solution?
>

The problem is that the recipe overloads PACKAGECONFIG for it's own
purposes.  We either change that, or add the stub like you did.

(I almost mailed exactly what Martin did too...)

Ross

[-- Attachment #2: Type: text/html, Size: 1185 bytes --]