Create packagegroup-busybox and modify packagegroup-core-boot
to conditionally use it.
Signed-off-by: Joe Slater <jsla...@windriver.com>
---
.../packagegroups/packagegroup-busybox.bb | 23 ++++++++++++++++++++
.../packagegroups/packagegroup-core-boot.bb | 17 ++++++++-------
2 files changed, 32 insertions(+), 8 deletions(-)
create mode 100644 meta/recipes-core/packagegroups/packagegroup-busybox.bb
diff --git a/meta/recipes-core/packagegroups/packagegroup-busybox.bb
b/meta/recipes-core/packagegroups/packagegroup-busybox.bb
new file mode 100644
index 0000000..acf0791
--- /dev/null
+++ b/meta/recipes-core/packagegroups/packagegroup-busybox.bb
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2015 Wind River Inc.
+#
+
+SUMMARY = "Busybox related information"
+DESCRIPTION = "Busybox packages and variables"
+LICENSE = "MIT"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup
+
+# Do not ever, ever override LOCAL variables.
+#
+LOCAL_sysvinit = " \
+ ${@bb.utils.contains('MACHINE_FEATURES', 'rtc',
'busybox-hwclock', '', d)} \
+ "
+
+RDEPENDS_${PN} = "\
+ busybox \
+ ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${LOCAL_sysvinit}",
"", d)} \
+ "
+
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index 09f5373..b2d0775 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -17,14 +17,17 @@ inherit packagegroup
MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
-# Distro can override the following VIRTUAL-RUNTIME providers:
+# These can be overridden in any .conf file.
+#
VIRTUAL-RUNTIME_dev_manager ?= "udev"
-VIRTUAL-RUNTIME_login_manager ?= "busybox"
-VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
VIRTUAL-RUNTIME_initscripts ?= "initscripts"
VIRTUAL-RUNTIME_keymaps ?= "keymaps"
+VIRTUAL-RUNTIME_busybox ?= "packagegroup-busybox"
-SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc',
'busybox-hwclock', '', d)} \
+# Do not ever, ever override LOCAL variables.
+#
+LOCAL_sysvinit = " \
+ sysvinit \
modutils-initscripts \
init-ifupdown \
${VIRTUAL-RUNTIME_initscripts} \
@@ -33,12 +36,10 @@ SYSVINIT_SCRIPTS =
"${@bb.utils.contains('MACHINE_FEATURES', 'rtc', 'busybox-hwc
RDEPENDS_${PN} = "\
base-files \
base-passwd \
- busybox \
- ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}",
"", d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${LOCAL_sysvinit}",
"", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "keyboard",
"${VIRTUAL-RUNTIME_keymaps}", "", d)} \
netbase \
- ${VIRTUAL-RUNTIME_login_manager} \
- ${VIRTUAL-RUNTIME_init_manager} \
+ ${VIRTUAL-RUNTIME_busybox} \
${VIRTUAL-RUNTIME_dev_manager} \
${VIRTUAL-RUNTIME_update-alternatives} \
${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
--
1.7.9.5
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
