Patchwork packagegroup-core-boot: correct runtime dependencies for non-sysvinit system

login
register
mail settings
Submitter Saul Wold
Date Aug. 2, 2013, 4:45 a.m.
Message ID <1375418740-14692-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/54951/
State Accepted
Commit ad6230c6e33cc76d735319d0f12ff6630655c288
Headers show

Comments

Saul Wold - Aug. 2, 2013, 4:45 a.m.
[YOCTO #4969]

Signed-off-by: Saul Wold <sgw@linux.intel.com>

core

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
Martin Jansa - Aug. 2, 2013, 6:53 a.m.
On Thu, Aug 01, 2013 at 09:45:40PM -0700, Saul Wold wrote:
> [YOCTO #4969]
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> 
> core
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>

^^^ Something is missing and something is redundant :).

> ---
>  meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> index d69c41d..486385a 100644
> --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
> @@ -30,15 +30,18 @@ VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
>  VIRTUAL-RUNTIME_initscripts ?= "initscripts"
>  VIRTUAL-RUNTIME_keymaps ?= "keymaps"
>  
> +SYSVINIT_SCRIPTS = "${@base_contains('MACHINE_FEATURES', 'rtc', 'busybox-hwclock', '', d)} \
> +                    modutils-initscripts \
> +                    init-ifupdown \
> +                   "
> +
>  RDEPENDS_${PN} = "\
>      base-files \
>      base-passwd \
>      busybox \
> -    ${@base_contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \
> +    ${@base_contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \
>      ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
> -    modutils-initscripts \
>      netbase \
> -    init-ifupdown \
>      ${VIRTUAL-RUNTIME_login_manager} \
>      ${VIRTUAL-RUNTIME_init_manager} \
>      ${VIRTUAL-RUNTIME_initscripts} \
> -- 
> 1.8.1.4
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index d69c41d..486385a 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -30,15 +30,18 @@  VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
 VIRTUAL-RUNTIME_initscripts ?= "initscripts"
 VIRTUAL-RUNTIME_keymaps ?= "keymaps"
 
+SYSVINIT_SCRIPTS = "${@base_contains('MACHINE_FEATURES', 'rtc', 'busybox-hwclock', '', d)} \
+                    modutils-initscripts \
+                    init-ifupdown \
+                   "
+
 RDEPENDS_${PN} = "\
     base-files \
     base-passwd \
     busybox \
-    ${@base_contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \
+    ${@base_contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \
     ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
-    modutils-initscripts \
     netbase \
-    init-ifupdown \
     ${VIRTUAL-RUNTIME_login_manager} \
     ${VIRTUAL-RUNTIME_init_manager} \
     ${VIRTUAL-RUNTIME_initscripts} \