[PATCH] poky.conf: Don't force the addition of extra DISTRO_FEATURES

[PATCH] poky.conf: Don't force the addition of extra DISTRO_FEATURES

[Otavio Salvador]

The DISTRO_FEATURES shouldn't unconditionally append items to it. This
makes it impossible to override it inside of local.conf or in a distro
based on Poky.

This moved the definition to poky.conf and created a new variable
(POKY_DEFAULT_DISTRO_FEATURES) which easy overriding of this, for Poky
based distros.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta-yocto/conf/distro/poky.conf | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 7be7d92..3538588 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -12,7 +12,12 @@ TARGET_VENDOR = "-poky"
 LOCALCONF_VERSION = "1"
 LAYER_CONF_VERSION ?= "6"
 
-DISTRO_FEATURES_append = " largefile opengl multiarch wayland"
+# Override these in poky based distros
+POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch wayland"
+POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
+POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
+
+DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}"
 
 PREFERRED_VERSION_linux-yocto ?= "3.4%"
 PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.8%"
@@ -27,10 +32,6 @@ SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
 
 EXTRAOPKGCONFIG = "poky-feed-config-opkg"
 
-# Override these in poky based distros to modify DISTRO_EXTRA_R*
-POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
-POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
-
 DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"
 DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}"
 
-- 
1.8.3.2

Re: [PATCH] poky.conf: Don't force the addition of extra DISTRO_FEATURES

[Otavio Salvador]

On Mon, Aug 5, 2013 at 11:00 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> The DISTRO_FEATURES shouldn't unconditionally append items to it. This
> makes it impossible to override it inside of local.conf or in a distro
> based on Poky.
>
> This moved the definition to poky.conf and created a new variable
> (POKY_DEFAULT_DISTRO_FEATURES) which easy overriding of this, for Poky
> based distros.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

Saul,

Did you queued this one? Is there any feedback about this patch?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [PATCH] poky.conf: Don't force the addition of extra DISTRO_FEATURES

[Saul Wold]

On 08/09/2013 10:49 AM, Otavio Salvador wrote:
> On Mon, Aug 5, 2013 at 11:00 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>> The DISTRO_FEATURES shouldn't unconditionally append items to it. This
>> makes it impossible to override it inside of local.conf or in a distro
>> based on Poky.
>>
>> This moved the definition to poky.conf and created a new variable
>> (POKY_DEFAULT_DISTRO_FEATURES) which easy overriding of this, for Poky
>> based distros.
>>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>
> Saul,
>
> Did you queued this one? Is there any feedback about this patch?
>
This was missed becuase it went to the Yocto list not the 
Poky@yoctoproject.org list.

I will queue it.

Sau!

Re: [PATCH] poky.conf: Don't force the addition of extra DISTRO_FEATURES

[Otavio Salvador]

On Fri, Aug 9, 2013 at 3:22 PM, Saul Wold <sgw@linux.intel.com> wrote:
> On 08/09/2013 10:49 AM, Otavio Salvador wrote:
>>
>> On Mon, Aug 5, 2013 at 11:00 AM, Otavio Salvador
>> <otavio@ossystems.com.br> wrote:
>>>
>>> The DISTRO_FEATURES shouldn't unconditionally append items to it. This
>>> makes it impossible to override it inside of local.conf or in a distro
>>> based on Poky.
>>>
>>> This moved the definition to poky.conf and created a new variable
>>> (POKY_DEFAULT_DISTRO_FEATURES) which easy overriding of this, for Poky
>>> based distros.
>>>
>>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>>
>>
>> Saul,
>>
>> Did you queued this one? Is there any feedback about this patch?
>>
> This was missed becuase it went to the Yocto list not the
> Poky@yoctoproject.org list.
>
> I will queue it.

Arrg; -ETOOMANYLISTS! ;-)

Thanks

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750