Patchwork [PATCHv2] packagegroup-core-boot: add VIRTUAL-RUNTIME_network_manager

login
mail settings
Submitter ml@communistcode.co.uk
Date Feb. 8, 2013, 3:20 p.m.
Message ID <1360336833-14523-1-git-send-email-ml@communistcode.co.uk>
Download mbox | patch
Permalink /patch/44345/
State New
Headers show

Comments

ml@communistcode.co.uk - Feb. 8, 2013, 3:20 p.m.
From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>

Now netbase has been split into netbase and init-ifupdown, the user should
be able to make a choice on which network manager to install, and not be
forced to install init-ifupdown alongside if they wish to use a vanilla copy
of packagegroup-core-boot

v2:
- Update packagage-core-x11-sato to use the new variable

Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
---
 meta/recipes-core/packagegroups/packagegroup-core-boot.bb     | 3 ++-
 meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
Martin Jansa - Feb. 8, 2013, 3:50 p.m.
On Fri, Feb 08, 2013 at 03:20:33PM +0000, ml@communistcode.co.uk wrote:
> From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
> 
> Now netbase has been split into netbase and init-ifupdown, the user should
> be able to make a choice on which network manager to install, and not be
> forced to install init-ifupdown alongside if they wish to use a vanilla copy
> of packagegroup-core-boot
> 
> v2:
> - Update packagage-core-x11-sato to use the new variable
> 
> Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
> ---
>  meta/recipes-core/packagegroups/packagegroup-core-boot.bb     | 3 ++-
>  meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | 3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> index b9183a8..a714879 100644
> --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> @@ -29,6 +29,7 @@ VIRTUAL-RUNTIME_login_manager ?= "tinylogin"
>  VIRTUAL-RUNTIME_init_manager ?= "${DISTRO_FEATURES_INITMAN}"
>  VIRTUAL-RUNTIME_initscripts ?= "${@base_contains('DISTRO_FEATURES', 'sysvinit', 'initscripts', '',d)}"
>  VIRTUAL-RUNTIME_keymaps ?= "keymaps"
> +VIRTUAL-RUNTIME_network_manager ?= "init-ifupdown"
>  
>  RDEPENDS_${PN} = "\
>      base-files \
> @@ -38,7 +39,7 @@ RDEPENDS_${PN} = "\
>      ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
>      modutils-initscripts \
>      netbase \
> -    init-ifupdown \
> +    ${VIRTUAL-RUNTIME_network_manager} \
>      ${VIRTUAL-RUNTIME_login_manager} \
>      ${VIRTUAL-RUNTIME_init_manager} \
>      ${VIRTUAL-RUNTIME_initscripts} \
> diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
> index a4413be..7c000ab 100644
> --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
> +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
> @@ -26,6 +26,8 @@ RDEPENDS_${PN} = "\
>  NETWORK_MANAGER ?= "connman-gnome"
>  NETWORK_MANAGER_libc-uclibc = ""
>  
> +VIRTUAL-RUNTIME_network_manager = "${NETWORK_MANAGER}"

Please use ?= here too

> +
>  SUMMARY_${PN}-base = "Sato desktop - base packages"
>  RDEPENDS_${PN}-base = "\
>      matchbox-desktop \
> @@ -40,7 +42,6 @@ RDEPENDS_${PN}-base = "\
>      gtk-sato-engine \
>      shutdown-desktop \
>      libsdl \
> -    ${NETWORK_MANAGER} \
>      "
>  
>  # pcmanfm doesn't work on mips
> -- 
> 1.8.1.2
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Ross Burton - Feb. 8, 2013, 3:54 p.m.
On 8 February 2013 15:20,  <ml@communistcode.co.uk> wrote:
> Now netbase has been split into netbase and init-ifupdown, the user should
> be able to make a choice on which network manager to install, and not be
> forced to install init-ifupdown alongside if they wish to use a vanilla copy
> of packagegroup-core-boot
>
> v2:
> - Update packagage-core-x11-sato to use the new variable

> @@ -26,6 +26,8 @@ RDEPENDS_${PN} = "\
>  NETWORK_MANAGER ?= "connman-gnome"
>  NETWORK_MANAGER_libc-uclibc = ""
>
> +VIRTUAL-RUNTIME_network_manager = "${NETWORK_MANAGER}"
> +
>  SUMMARY_${PN}-base = "Sato desktop - base packages"
>  RDEPENDS_${PN}-base = "\
>      matchbox-desktop \
> @@ -40,7 +42,6 @@ RDEPENDS_${PN}-base = "\
>      gtk-sato-engine \
>      shutdown-desktop \
>      libsdl \
> -    ${NETWORK_MANAGER} \
>      "

I meant to keep the NETWORK_MANAGER variable as that's the networking
UI (connman-gnome is the panel menu), but also add the VR_nm variable.

Ross
ml@communistcode.co.uk - Feb. 8, 2013, 3:56 p.m.
On 08/02/13 15:50, Martin Jansa wrote:
> On Fri, Feb 08, 2013 at 03:20:33PM +0000, ml@communistcode.co.uk wrote:
>> From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
>>
>> Now netbase has been split into netbase and init-ifupdown, the user should
>> be able to make a choice on which network manager to install, and not be
>> forced to install init-ifupdown alongside if they wish to use a vanilla copy
>> of packagegroup-core-boot
>>
>> v2:
>> - Update packagage-core-x11-sato to use the new variable
>>
>> Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
>> ---
>>   meta/recipes-core/packagegroups/packagegroup-core-boot.bb     | 3 ++-
>>   meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | 3 ++-
>>   2 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
>> index b9183a8..a714879 100644
>> --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
>> +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
>> @@ -29,6 +29,7 @@ VIRTUAL-RUNTIME_login_manager ?= "tinylogin"
>>   VIRTUAL-RUNTIME_init_manager ?= "${DISTRO_FEATURES_INITMAN}"
>>   VIRTUAL-RUNTIME_initscripts ?= "${@base_contains('DISTRO_FEATURES', 'sysvinit', 'initscripts', '',d)}"
>>   VIRTUAL-RUNTIME_keymaps ?= "keymaps"
>> +VIRTUAL-RUNTIME_network_manager ?= "init-ifupdown"
>>   
>>   RDEPENDS_${PN} = "\
>>       base-files \
>> @@ -38,7 +39,7 @@ RDEPENDS_${PN} = "\
>>       ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
>>       modutils-initscripts \
>>       netbase \
>> -    init-ifupdown \
>> +    ${VIRTUAL-RUNTIME_network_manager} \
>>       ${VIRTUAL-RUNTIME_login_manager} \
>>       ${VIRTUAL-RUNTIME_init_manager} \
>>       ${VIRTUAL-RUNTIME_initscripts} \
>> diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
>> index a4413be..7c000ab 100644
>> --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
>> +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
>> @@ -26,6 +26,8 @@ RDEPENDS_${PN} = "\
>>   NETWORK_MANAGER ?= "connman-gnome"
>>   NETWORK_MANAGER_libc-uclibc = ""
>>   
>> +VIRTUAL-RUNTIME_network_manager = "${NETWORK_MANAGER}"
> Please use ?= here too
>
>> +
>>   SUMMARY_${PN}-base = "Sato desktop - base packages"
>>   RDEPENDS_${PN}-base = "\
>>       matchbox-desktop \
>> @@ -40,7 +42,6 @@ RDEPENDS_${PN}-base = "\
>>       gtk-sato-engine \
>>       shutdown-desktop \
>>       libsdl \
>> -    ${NETWORK_MANAGER} \
>>       "
>>   
>>   # pcmanfm doesn't work on mips
>> -- 
>> 1.8.1.2
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

I have just given this another run through and it seems that 
VIRTUAL-RUNTIME only takes effect when set in the distro .conf, is this 
expected? If so, then it won't make any difference when set in the image 
recipe... correct?
Otavio Salvador - Feb. 8, 2013, 4:53 p.m.
On Fri, Feb 8, 2013 at 1:20 PM,  <ml@communistcode.co.uk> wrote:
> From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
>
> Now netbase has been split into netbase and init-ifupdown, the user should
> be able to make a choice on which network manager to install, and not be
> forced to install init-ifupdown alongside if they wish to use a vanilla copy
> of packagegroup-core-boot
>
> v2:
> - Update packagage-core-x11-sato to use the new variable

v2 comment ought to be done bellow --- line.

> Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
> ---
>  meta/recipes-core/packagegroups/packagegroup-core-boot.bb     | 3 ++-
>  meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | 3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> index b9183a8..a714879 100644
> --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> @@ -29,6 +29,7 @@ VIRTUAL-RUNTIME_login_manager ?= "tinylogin"
>  VIRTUAL-RUNTIME_init_manager ?= "${DISTRO_FEATURES_INITMAN}"
>  VIRTUAL-RUNTIME_initscripts ?= "${@base_contains('DISTRO_FEATURES', 'sysvinit', 'initscripts', '',d)}"
>  VIRTUAL-RUNTIME_keymaps ?= "keymaps"
> +VIRTUAL-RUNTIME_network_manager ?= "init-ifupdown"
>
>  RDEPENDS_${PN} = "\
>      base-files \
> @@ -38,7 +39,7 @@ RDEPENDS_${PN} = "\
>      ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
>      modutils-initscripts \
>      netbase \
> -    init-ifupdown \
> +    ${VIRTUAL-RUNTIME_network_manager} \
>      ${VIRTUAL-RUNTIME_login_manager} \
>      ${VIRTUAL-RUNTIME_init_manager} \
>      ${VIRTUAL-RUNTIME_initscripts} \
> diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
> index a4413be..7c000ab 100644
> --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
> +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
> @@ -26,6 +26,8 @@ RDEPENDS_${PN} = "\
>  NETWORK_MANAGER ?= "connman-gnome"
>  NETWORK_MANAGER_libc-uclibc = ""
>
> +VIRTUAL-RUNTIME_network_manager = "${NETWORK_MANAGER}"
> +
>  SUMMARY_${PN}-base = "Sato desktop - base packages"
>  RDEPENDS_${PN}-base = "\
>      matchbox-desktop \
> @@ -40,7 +42,6 @@ RDEPENDS_${PN}-base = "\
>      gtk-sato-engine \
>      shutdown-desktop \
>      libsdl \
> -    ${NETWORK_MANAGER} \
>      "
>
>  # pcmanfm doesn't work on mips
> --
> 1.8.1.2
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
ml@communistcode.co.uk - Feb. 11, 2013, 11:18 a.m.
On 08/02/13 15:20, ml@communistcode.co.uk wrote:
> From: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
>
> Now netbase has been split into netbase and init-ifupdown, the user should
> be able to make a choice on which network manager to install, and not be
> forced to install init-ifupdown alongside if they wish to use a vanilla copy
> of packagegroup-core-boot
>
> v2:
> - Update packagage-core-x11-sato to use the new variable
>
> Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
> ---
>   meta/recipes-core/packagegroups/packagegroup-core-boot.bb     | 3 ++-
>   meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | 3 ++-
>   2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> index b9183a8..a714879 100644
> --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> @@ -29,6 +29,7 @@ VIRTUAL-RUNTIME_login_manager ?= "tinylogin"
>   VIRTUAL-RUNTIME_init_manager ?= "${DISTRO_FEATURES_INITMAN}"
>   VIRTUAL-RUNTIME_initscripts ?= "${@base_contains('DISTRO_FEATURES', 'sysvinit', 'initscripts', '',d)}"
>   VIRTUAL-RUNTIME_keymaps ?= "keymaps"
> +VIRTUAL-RUNTIME_network_manager ?= "init-ifupdown"
>   
>   RDEPENDS_${PN} = "\
>       base-files \
> @@ -38,7 +39,7 @@ RDEPENDS_${PN} = "\
>       ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
>       modutils-initscripts \
>       netbase \
> -    init-ifupdown \
> +    ${VIRTUAL-RUNTIME_network_manager} \
>       ${VIRTUAL-RUNTIME_login_manager} \
>       ${VIRTUAL-RUNTIME_init_manager} \
>       ${VIRTUAL-RUNTIME_initscripts} \
> diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
> index a4413be..7c000ab 100644
> --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
> +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
> @@ -26,6 +26,8 @@ RDEPENDS_${PN} = "\
>   NETWORK_MANAGER ?= "connman-gnome"
>   NETWORK_MANAGER_libc-uclibc = ""
>   
> +VIRTUAL-RUNTIME_network_manager = "${NETWORK_MANAGER}"
> +
>   SUMMARY_${PN}-base = "Sato desktop - base packages"
>   RDEPENDS_${PN}-base = "\
>       matchbox-desktop \
> @@ -40,7 +42,6 @@ RDEPENDS_${PN}-base = "\
>       gtk-sato-engine \
>       shutdown-desktop \
>       libsdl \
> -    ${NETWORK_MANAGER} \
>       "
>   
>   # pcmanfm doesn't work on mips

Ok, this isn't going to work as I intended, VIRTUAL-RUNTIME can only be 
set in the distro configuration so we can't have it set on a per image 
basis. I'm not sure how the best way to solve this is now, suggestions 
welcomed...

Regards,

Patch

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index b9183a8..a714879 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -29,6 +29,7 @@  VIRTUAL-RUNTIME_login_manager ?= "tinylogin"
 VIRTUAL-RUNTIME_init_manager ?= "${DISTRO_FEATURES_INITMAN}"
 VIRTUAL-RUNTIME_initscripts ?= "${@base_contains('DISTRO_FEATURES', 'sysvinit', 'initscripts', '',d)}"
 VIRTUAL-RUNTIME_keymaps ?= "keymaps"
+VIRTUAL-RUNTIME_network_manager ?= "init-ifupdown"
 
 RDEPENDS_${PN} = "\
     base-files \
@@ -38,7 +39,7 @@  RDEPENDS_${PN} = "\
     ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
     modutils-initscripts \
     netbase \
-    init-ifupdown \
+    ${VIRTUAL-RUNTIME_network_manager} \
     ${VIRTUAL-RUNTIME_login_manager} \
     ${VIRTUAL-RUNTIME_init_manager} \
     ${VIRTUAL-RUNTIME_initscripts} \
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index a4413be..7c000ab 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -26,6 +26,8 @@  RDEPENDS_${PN} = "\
 NETWORK_MANAGER ?= "connman-gnome"
 NETWORK_MANAGER_libc-uclibc = ""
 
+VIRTUAL-RUNTIME_network_manager = "${NETWORK_MANAGER}"
+
 SUMMARY_${PN}-base = "Sato desktop - base packages"
 RDEPENDS_${PN}-base = "\
     matchbox-desktop \
@@ -40,7 +42,6 @@  RDEPENDS_${PN}-base = "\
     gtk-sato-engine \
     shutdown-desktop \
     libsdl \
-    ${NETWORK_MANAGER} \
     "
 
 # pcmanfm doesn't work on mips