[OE-core] [PATCH 3/3][SOLUTION 2] add variable NETWORK_MANAGER to fix confliction between connman and networkmanager
Hongxu Jia
hongxu.jia at windriver.com
Tue Dec 22 08:43:21 UTC 2015
In meta-oe, the networkmanager conflicts with connman. In order to fix
it, we introduce variable NETWORK_MANAGER which was original used in
meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb.
So we could decide which network manager (connman or networkmanager...) to
use by override NETWORK_MANAGER.
The connman-plugin-ethernet has been added to connman's
RPROVIDES, so remove it and keep connman is ok.
Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
---
meta/conf/bitbake.conf | 4 ++++
meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 3 +--
meta/recipes-extended/images/core-image-kernel-dev.bb | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 2b81be1..04fa3ff 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -789,6 +789,10 @@ SHELL[unexport] = "1"
# Used by canadian-cross to handle string conversions on TARGET_ARCH where needed
TRANSLATED_TARGET_ARCH ??= "${@d.getVar('TARGET_ARCH', True).replace("_", "-")}"
+# Added to related recipe's RDEPDNS to decide which network manager
+# (connman or networkmanager...) to use
+NETWORK_MANAGER ??= "connman"
+
# Complete output from bitbake
BB_CONSOLELOG ?= "${LOG_DIR}/cooker/${MACHINE}/${DATETIME}.log"
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index ceaa242..f5291e7 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -29,8 +29,7 @@ RDEPENDS_packagegroup-self-hosted = "\
"
RDEPENDS_packagegroup-self-hosted-host-tools = "\
- connman \
- connman-plugin-ethernet \
+ ${NETWORK_MANAGER} \
dhcp-client \
e2fsprogs \
e2fsprogs-e2fsck \
diff --git a/meta/recipes-extended/images/core-image-kernel-dev.bb b/meta/recipes-extended/images/core-image-kernel-dev.bb
index 6b636ed..605df46 100644
--- a/meta/recipes-extended/images/core-image-kernel-dev.bb
+++ b/meta/recipes-extended/images/core-image-kernel-dev.bb
@@ -4,7 +4,7 @@ sensitive to kernel updates and version changes"
# Could also be core-image-basic, but we'll keep this small for now
require recipes-core/images/core-image-minimal.bb
-KERNEL_DEV_UTILS ?= "dropbear connman"
+KERNEL_DEV_UTILS ?= "dropbear ${NETWORK_MANAGER}"
KERNEL_DEV_TOOLS ?= "packagegroup-core-tools-profile packagegroup-core-buildessential kernel-devsrc"
KERNEL_DEV_MODULE ?= "kernel-modules"
--
1.9.1
More information about the Openembedded-core
mailing list