Patchwork poky-tiny: Update for DISTRO_FEATURES_INITMAN

login
register
mail settings
Submitter Saul Wold
Date Jan. 25, 2013, 11:05 p.m.
Message ID <1359155139-947-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/43437/
State New
Headers show

Comments

Saul Wold - Jan. 25, 2013, 11:05 p.m.
This patch accounts for the addition of DISTRO_FEATURES_INITMAN which
sets the VIRTUAL_RUNTIME_init_manager, so that does not need to be set.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta-yocto/conf/distro/poky-tiny.conf |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Darren Hart - Jan. 25, 2013, 11:25 p.m.
On 01/25/2013 03:05 PM, Saul Wold wrote:
> This patch accounts for the addition of DISTRO_FEATURES_INITMAN which
> sets the VIRTUAL_RUNTIME_init_manager, so that does not need to be set.
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>


I thought I understood it... until I read the new comment. What is this
DISTRO_FEATURED_BACKFILL thing?

--
Darren

> ---
>  meta-yocto/conf/distro/poky-tiny.conf |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-yocto/conf/distro/poky-tiny.conf b/meta-yocto/conf/distro/poky-tiny.conf
> index 347280a..761844f 100644
> --- a/meta-yocto/conf/distro/poky-tiny.conf
> +++ b/meta-yocto/conf/distro/poky-tiny.conf
> @@ -84,6 +84,8 @@ DISTRO_FEATURES_NET = "ipv4"
>  DISTRO_FEATURES_USB = "usbhost"
>  #DISTRO_FEATURES_USBGADGET = "usbgadget"
>  #DISTRO_FEATURES_WIFI = "wifi"
> +# This is needed for DISTRO_FEATURES_BACKFILL
> +DISTRO_FEATURES_INITMAN = "tiny-init"
>  
>  DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \
>                     ${DISTRO_FEATURES_NET} \
> @@ -96,7 +98,6 @@ DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \
>  # Use tmpdevfs and the busybox runtime services
>  VIRTUAL-RUNTIME_dev_manager = ""
>  VIRTUAL-RUNTIME_login_manager = ""
> -VIRTUAL-RUNTIME_init_manager = "tiny-init"
>  VIRTUAL-RUNTIME_keymaps = ""
>  
>  # FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in
>
Saul Wold - Jan. 25, 2013, 11:33 p.m.
On 01/25/2013 03:25 PM, Darren Hart wrote:
> On 01/25/2013 03:05 PM, Saul Wold wrote:
>> This patch accounts for the addition of DISTRO_FEATURES_INITMAN which
>> sets the VIRTUAL_RUNTIME_init_manager, so that does not need to be set.
>>
>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>
>
> I thought I understood it... until I read the new comment. What is this
> DISTRO_FEATURED_BACKFILL thing?
>
It ensure that items in the backfill show up in all DISTRO_FEATURES, 
think of it as a required core part of DISTRO_FEATURES.

See Git Rev: 72ce5c4cde612515451226a1b10f5b348a4a6a4c for a better 
explanation from Paul.

Re-reading this we should include pulseaudio in 
DISTRO_FEATURES_BACKFILL_CONSIDERED for poky-tiny as a separate patch


Sau!

> --
> Darren
>
>> ---
>>   meta-yocto/conf/distro/poky-tiny.conf |    3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta-yocto/conf/distro/poky-tiny.conf b/meta-yocto/conf/distro/poky-tiny.conf
>> index 347280a..761844f 100644
>> --- a/meta-yocto/conf/distro/poky-tiny.conf
>> +++ b/meta-yocto/conf/distro/poky-tiny.conf
>> @@ -84,6 +84,8 @@ DISTRO_FEATURES_NET = "ipv4"
>>   DISTRO_FEATURES_USB = "usbhost"
>>   #DISTRO_FEATURES_USBGADGET = "usbgadget"
>>   #DISTRO_FEATURES_WIFI = "wifi"
>> +# This is needed for DISTRO_FEATURES_BACKFILL
>> +DISTRO_FEATURES_INITMAN = "tiny-init"
>>
>>   DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \
>>                      ${DISTRO_FEATURES_NET} \
>> @@ -96,7 +98,6 @@ DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \
>>   # Use tmpdevfs and the busybox runtime services
>>   VIRTUAL-RUNTIME_dev_manager = ""
>>   VIRTUAL-RUNTIME_login_manager = ""
>> -VIRTUAL-RUNTIME_init_manager = "tiny-init"
>>   VIRTUAL-RUNTIME_keymaps = ""
>>
>>   # FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in
>>
>
Darren Hart - Jan. 25, 2013, 11:40 p.m.
On 01/25/2013 03:33 PM, Saul Wold wrote:
> On 01/25/2013 03:25 PM, Darren Hart wrote:
>> On 01/25/2013 03:05 PM, Saul Wold wrote:
>>> This patch accounts for the addition of DISTRO_FEATURES_INITMAN which
>>> sets the VIRTUAL_RUNTIME_init_manager, so that does not need to be set.
>>>
>>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>>
>>
>> I thought I understood it... until I read the new comment. What is this
>> DISTRO_FEATURED_BACKFILL thing?
>>
> It ensure that items in the backfill show up in all DISTRO_FEATURES, 
> think of it as a required core part of DISTRO_FEATURES.
> 
> See Git Rev: 72ce5c4cde612515451226a1b10f5b348a4a6a4c for a better 
> explanation from Paul.
> 

OK, I see how it works, but I think that comment confuses more than it
enlightens. I don't need to know anything about BACKFILL to understand
the meaning of DISTRO_FEATURES_INITMAN. It clearly overrides the init
manager used for images of this distro. I suggest dropping the Backfill
comment.

As for the actual change, it looks good to me, and thanks for doing it.
Does this remove the unwanted bash dependency?

--
Darren

> Re-reading this we should include pulseaudio in 
> DISTRO_FEATURES_BACKFILL_CONSIDERED for poky-tiny as a separate patch
> 
> 
> Sau!
> 
>> --
>> Darren
>>
>>> ---
>>>   meta-yocto/conf/distro/poky-tiny.conf |    3 ++-
>>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/meta-yocto/conf/distro/poky-tiny.conf b/meta-yocto/conf/distro/poky-tiny.conf
>>> index 347280a..761844f 100644
>>> --- a/meta-yocto/conf/distro/poky-tiny.conf
>>> +++ b/meta-yocto/conf/distro/poky-tiny.conf
>>> @@ -84,6 +84,8 @@ DISTRO_FEATURES_NET = "ipv4"
>>>   DISTRO_FEATURES_USB = "usbhost"
>>>   #DISTRO_FEATURES_USBGADGET = "usbgadget"
>>>   #DISTRO_FEATURES_WIFI = "wifi"
>>> +# This is needed for DISTRO_FEATURES_BACKFILL
>>> +DISTRO_FEATURES_INITMAN = "tiny-init"
>>>
>>>   DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \
>>>                      ${DISTRO_FEATURES_NET} \
>>> @@ -96,7 +98,6 @@ DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \
>>>   # Use tmpdevfs and the busybox runtime services
>>>   VIRTUAL-RUNTIME_dev_manager = ""
>>>   VIRTUAL-RUNTIME_login_manager = ""
>>> -VIRTUAL-RUNTIME_init_manager = "tiny-init"
>>>   VIRTUAL-RUNTIME_keymaps = ""
>>>
>>>   # FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in
>>>
>>

Patch

diff --git a/meta-yocto/conf/distro/poky-tiny.conf b/meta-yocto/conf/distro/poky-tiny.conf
index 347280a..761844f 100644
--- a/meta-yocto/conf/distro/poky-tiny.conf
+++ b/meta-yocto/conf/distro/poky-tiny.conf
@@ -84,6 +84,8 @@  DISTRO_FEATURES_NET = "ipv4"
 DISTRO_FEATURES_USB = "usbhost"
 #DISTRO_FEATURES_USBGADGET = "usbgadget"
 #DISTRO_FEATURES_WIFI = "wifi"
+# This is needed for DISTRO_FEATURES_BACKFILL
+DISTRO_FEATURES_INITMAN = "tiny-init"
 
 DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \
                    ${DISTRO_FEATURES_NET} \
@@ -96,7 +98,6 @@  DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \
 # Use tmpdevfs and the busybox runtime services
 VIRTUAL-RUNTIME_dev_manager = ""
 VIRTUAL-RUNTIME_login_manager = ""
-VIRTUAL-RUNTIME_init_manager = "tiny-init"
 VIRTUAL-RUNTIME_keymaps = ""
 
 # FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in