Fix ico-uxf-homescreen/murphy conflict

Change-Id: I36ab2e9239fe683b39fa097a0db8b83cc5633a5a
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/conf/layer.conf b/conf/layer.conf
index cb825b1..60fa12f 100644 (file)
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -63,3 +63,4 @@ IMAGECONFIG ??= "config-tizen-common"
 
 FILESYSTEM_PERMS_TABLES = "tizen-fs-perms.txt"
 
+SYS_CTLR_PROVIDER = "murphy"

diff --git a/recipes-image/images/tizen-ivi-ico-image.bb b/recipes-image/images/tizen-ivi-ico-image.bb
index 9c3871c..8439097 100644 (file)
--- a/recipes-image/images/tizen-ivi-ico-image.bb
+++ b/recipes-image/images/tizen-ivi-ico-image.bb
@@ -12,4 +12,6 @@ WESTONINI = "ico-uxf-weston-plugin"
 CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-ivi-ico"
 
 # Crosswalk
-CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-crosswalk"
\ No newline at end of file
+CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-crosswalk"
+
+SYS_CTLR_PROVIDEER = "ico-uxf-homescreen"

diff --git a/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen-extraconf.inc b/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen-extraconf.inc
index f1db39a..ac53336 100644 (file)
--- a/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen-extraconf.inc
+++ b/recipes-tizen/ico-uxf-homescreen/ico-uxf-homescreen-extraconf.inc
@@ -22,6 +22,14 @@ do_compile_prepend()  {
  sed -i "s@-I/usr/include/ico-util@-I${PKG_CONFIG_SYSROOT_DIR}/usr/include/ico-util@g" ${S}/configure.ac
 }
 
+do_install_append() {
+    if ${@bb.utils.contains('SYS_CTLR_PROVIDER', 'ico-uxf-homescreen', 'false', 'true', d)}; then
+      rm -f ${D}${systemd_unitdir}/user/ico-uxf-wait-launchpad-ready.path
+      rm -f ${D}${systemd_unitdir}/user/weston.target.wants/ico-uxf-wait-launchpad-ready.path
+      rm -f ${D}${systemd_unitdir}/user/ico-system-controller.service
+    fi
+}
+
 DEPENDS += "pkgmgr-native"
 DEPENDS += "ail-native"
 
@@ -61,4 +69,7 @@ pkg_postrm_${PN}() {
     #pkg_initdb
     #ail_initdb
 
-}
\ No newline at end of file
+}
+
+PROVIDES_remove := "${@bb.utils.contains('SYS_CTLR_PROVIDER', 'ico-uxf-homescreen',"","system-controller",d)}"
+RPROVIDES_ico-uxf-homescreen-system-controller_remove :=  "${@bb.utils.contains('SYS_CTLR_PROVIDER', 'ico-uxf-homescreen','',"system-controller",d)}"

diff --git a/recipes-tizen/murphy/murphy-extraconf.inc b/recipes-tizen/murphy/murphy-extraconf.inc
index f4e982d..49c8c1c 100644 (file)
--- a/recipes-tizen/murphy/murphy-extraconf.inc
+++ b/recipes-tizen/murphy/murphy-extraconf.inc
@@ -1,6 +1,12 @@
 do_install_append() {
     rm -fr ${D}${systemd_unitdir}/user
     rm ${D}/usr/lib/libmurphy-plugin-system-monitor*
+
+    if ${@bb.utils.contains('SYS_CTLR_PROVIDER', 'murphy', 'false', 'true', d)}; then
+      rm ${D}${prefix}/lib/murphy/plugins/plugin-system-controller.so
+      rm ${D}${systemd_unitdir}/user/ico-homescreen.service
+      rm ${D}${systemd_unitdir}/user/murphy-wait-for-launchpad-ready.path
+    fi
 }
 
 FILES_${PN}-dev += " /usr/include/murphy" 
@@ -12,3 +18,6 @@ murphy-doc_files += "${prefix}/share/doc/murphy/CODING-STYLE"
 murphy-doc_files += "${prefix}/share/doc/murphy/ChangeLog"
 murphy-doc_files += "${prefix}/share/doc/murphy/NEWS"
 murphy-doc_files += "${prefix}/share/doc/murphy/README"
+
+PROVIDES_remove := "${@bb.utils.contains('SYS_CTLR_PROVIDER', 'murphy','',"system-controller",d)}"
+RPROVIDES_ico-uxf-homescreen-system-controller_remove :=  "${@bb.utils.contains('SYS_CTLR_PROVIDER', 'murphy','',"system-controller",d)}"