connman get conflicts with networkmanager when building the project. here introduce alias virtual/networkmanager for these two recipes, so setting PREFERRED_PROVIDER to the proper one can solve the conflicts.
this patch is for networkmanager recipe. Signed-off-by: Zhenbo Gao <[email protected]> --- meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb | 1 + meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.4.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb index 831ddf0..efd4d08 100644 --- a/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb +++ b/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ " DEPENDS = "libnl dbus dbus-glib libgudev util-linux libndp libnewt polkit" +PROVIDES = "virtual/networkmanager" inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.4.bb b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.4.bb index 2070db2..59e1d40 100644 --- a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.4.bb +++ b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.4.bb @@ -34,7 +34,7 @@ FILES_xfce4-powermanager-plugin = " \ " RDEPENDS_xfce4-powermanager-plugin = "${PN}" -RDEPENDS_${PN} = "networkmanager ${@bb.utils.contains('DISTRO_FEATURES','systemd','','consolekit',d)}" +RDEPENDS_${PN} = "virtual/networkmanager ${@bb.utils.contains('DISTRO_FEATURES','systemd','','consolekit',d)}" # xfce4-brightness-plugin was replaced by xfce4-powermanager-plugin RPROVIDES_xfce4-powermanager-plugin += "xfce4-brightness-plugin" -- 1.9.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
