Patchwork mesa: add PACKAGECONFIG_DISTRO variable for distro specific options

login
register
mail settings
Submitter Simon Busch
Date Aug. 19, 2013, 4:04 p.m.
Message ID <1376928263-9092-1-git-send-email-morphis@gravedo.de>
Download mbox | patch
Permalink /patch/55989/
State New
Headers show

Comments

Simon Busch - Aug. 19, 2013, 4:04 p.m.
In some cases as distribution just wants to extend the default PACKAGECONFIG instead of
rewriting it completely. Therefor having a PACKAGECONFIG_DISTRO variable which is empty
by default and included in PACKAGECONFIG helps a lot.

Signed-off-by: Simon Busch <morphis@gravedo.de>
---
 meta/recipes-graphics/mesa/mesa.inc | 2 ++
 1 file changed, 2 insertions(+)
Phil Blundell - Aug. 19, 2013, 4:09 p.m.
On Mon, 2013-08-19 at 18:04 +0200, Simon Busch wrote:
> In some cases as distribution just wants to extend the default PACKAGECONFIG instead of
> rewriting it completely. Therefor having a PACKAGECONFIG_DISTRO variable which is empty
> by default and included in PACKAGECONFIG helps a lot.

Can't those distros just use PACKAGECONFIG_append?

p.
Simon Busch - Aug. 19, 2013, 4:28 p.m.
Am 19.08.2013 18:09, schrieb Phil Blundell:
> On Mon, 2013-08-19 at 18:04 +0200, Simon Busch wrote:
>> In some cases as distribution just wants to extend the default PACKAGECONFIG instead of
>> rewriting it completely. Therefor having a PACKAGECONFIG_DISTRO variable which is empty
>> by default and included in PACKAGECONFIG helps a lot.
> 
> Can't those distros just use PACKAGECONFIG_append?

They can. I tried with PACKAGECONFIG += which didn't worked and I
thought it would be the same with PACKAGECONFIG_append cause of
PACKAGECONFIG being weak assignment in mesa.inc. But as it seems +=
takes higher than the weak assignment and overrides PACKAGECONFIG where
_append only appends.

regards,
Simon
Paul Eggleton - Aug. 19, 2013, 4:58 p.m.
On Monday 19 August 2013 18:28:02 Simon Busch wrote:
> Am 19.08.2013 18:09, schrieb Phil Blundell:
> > On Mon, 2013-08-19 at 18:04 +0200, Simon Busch wrote:
> >> In some cases as distribution just wants to extend the default
> >> PACKAGECONFIG instead of rewriting it completely. Therefor having a
> >> PACKAGECONFIG_DISTRO variable which is empty by default and included in
> >> PACKAGECONFIG helps a lot.
> > 
> > Can't those distros just use PACKAGECONFIG_append?
> 
> They can. I tried with PACKAGECONFIG += which didn't worked and I
> thought it would be the same with PACKAGECONFIG_append cause of
> PACKAGECONFIG being weak assignment in mesa.inc. But as it seems +=
> takes higher than the weak assignment and overrides PACKAGECONFIG where
> _append only appends.

It's being set in the recipe with ??= which is the weakest form of assignment, 
so this behaviour is expected. I just tested this in local.conf and it works:

PACKAGECONFIG_append_pn-mesa = " something"

BTW, outside of a recipe (or bbappend) you should always use a pn- override 
with PACKAGECONFIG or you'll be affecting more than just the recipe you intend 
to.

Cheers,
Paul
Simon Busch - Aug. 19, 2013, 7 p.m.
Am 19.08.2013 18:58, schrieb Paul Eggleton:
> On Monday 19 August 2013 18:28:02 Simon Busch wrote:
>> Am 19.08.2013 18:09, schrieb Phil Blundell:
>>> On Mon, 2013-08-19 at 18:04 +0200, Simon Busch wrote:
>>>> In some cases as distribution just wants to extend the default
>>>> PACKAGECONFIG instead of rewriting it completely. Therefor having a
>>>> PACKAGECONFIG_DISTRO variable which is empty by default and included in
>>>> PACKAGECONFIG helps a lot.
>>>
>>> Can't those distros just use PACKAGECONFIG_append?
>>
>> They can. I tried with PACKAGECONFIG += which didn't worked and I
>> thought it would be the same with PACKAGECONFIG_append cause of
>> PACKAGECONFIG being weak assignment in mesa.inc. But as it seems +=
>> takes higher than the weak assignment and overrides PACKAGECONFIG where
>> _append only appends.
> 
> It's being set in the recipe with ??= which is the weakest form of assignment, 
> so this behaviour is expected. I just tested this in local.conf and it works:
> 
> PACKAGECONFIG_append_pn-mesa = " something"
> 
> BTW, outside of a recipe (or bbappend) you should always use a pn- override 
> with PACKAGECONFIG or you'll be affecting more than just the recipe you intend 
> to.

Thank you very much for the good explanation.

regards,
Simon

Patch

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 447e186..2875158 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -23,9 +23,11 @@  inherit autotools pkgconfig pythonnative gettext
 
 EXTRA_OECONF = "--enable-shared-glapi"
 
+PACKAGECONFIG_DISTRO ??= ""
 PACKAGECONFIG ??= "egl gles dri \
 		${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\
 		${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\
+		${PACKAGECONFIG_DISTRO} \
 		"
 
 X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"