tlm-extraconf.inc: remove hacks, disable ico

The old hacks for getting IVI configuration packages created
are no longer necessary, because the base .inc file is now
the one for IVI.

Unfortunately building tlm-config-ivi-singleseat-ico runs
into a whole range of issues because of the dependency on
a native version of the pkgmgr. Even if we could it get to
build, whether it would work is another question. Ignoring
this issue for now...

Change-Id: I95190032007198702c394528116e2bb08ea03987

diff --git a/meta-tizen-common-base/recipes-core/tlm/tlm-extraconf.inc b/meta-tizen-common-base/recipes-core/tlm/tlm-extraconf.inc
index 700f5ec..e04f46f 100644 (file)
--- a/meta-tizen-common-base/recipes-core/tlm/tlm-extraconf.inc
+++ b/meta-tizen-common-base/recipes-core/tlm/tlm-extraconf.inc
@@ -2,59 +2,16 @@ FILES_${PN}-dbg += "${prefix}/lib/tlm/plugins/.debug"
 inherit systemd
 SYSTEMD_SERVICE_${PN} = "tlm.service"
 
-PACKAGES += " ${PN}-conf"
-PACKAGES += " ${PN}-config-ivi"
-PACKAGES += " ${PN}-config-ivi-singleseat "
-PACKAGES += " ${PN}-config-ivi-multiseat "
-PACKAGES += " ${PN}-config-ivi-vtc1010 "
-
-RDEPENDS_${PN}-config-common += "${PN}-conf"
-RDEPENDS_${PN}-config-ivi += "${PN}-conf"
-RDEPENDS_${PN}-config-ivi-singleseat += "${PN}-config-ivi"
-RDEPENDS_${PN}-config-ivi-multiseat += "${PN}-config-ivi"
-RDEPENDS_${PN}-config-ivi-vtc1010 += "${PN}-config-ivi"
-
-FILES_${PN}-conf += "${sysconfdir}/session.d/user-session"
-FILES_${PN}-config-common_remove = "${sysconfdir}/session.d/*"
-
-FILES_${PN}-config-ivi += "${sysconfdir}/session.d/user-session-ico"
-FILES_${PN}-config-ivi += "${sysconfdir}/session.d/user-session-modello"
-FILES_${PN}-config-ivi += "${sysconfdir}/xdg/weston/weston-user.ini"
-FILES_${PN}-config-ivi += "${sysconfdir}/xdg/weston/weston-genivi.ini"
-
-FILES_${PN}-config-ivi-singleseat += "${sysconfdir}/tlm-singleseat.conf"
-FILES_${PN}-config-ivi-singleseat += "${sysconfdir}/session.d/genivi-session-singleseat"
-
-FILES_${PN}-config-ivi-multiseat +=  "${sysconfdir}/tlm-multiseat.conf"
-FILES_${PN}-config-ivi-multiseat +=  "${sysconfdir}/session.d/genivi-session-multiseat"
-
-FILES_${PN}-config-ivi-vtc1010 += "${sysconfdir}/tlm-vtc1010.conf"
-FILES_${PN}-config-ivi-vtc1010 += "${sysconfdir}/session.d/genivi-session-vtc1010"
-FILES_${PN}-config-ivi-vtc1010 += "${sysconfdir}/xdg/weston/weston-genivi-vtc1010.ini"
-FILES_${PN}-config-ivi-vtc1010 += "${sysconfdir}/udev/rules.d/*"
-
-PKG_tlm-config-ivi = "tlm-config-ivi"
-PKG_tlm-config-ivi-singleseat= "tlm-config-ivi-singleseat"
-PKG_tlm-config-ivi-multiseat = "tlm-config-ivi-multiseat"
-PKG_tlm-config-ivi-vtc1010   = "tlm-config-ivi-vtc1010"
-
-
-pkg_postinst_${PN}-config-ivi-singleseat() {
- ln -s -f /etc/tlm-singleseat.conf $D/etc/tlm.conf
- grep -q user-session-modello $D/etc/tlm-singleseat.conf || sed -i s:SESSION_CMD=/etc/session.d/user-session:SESSION_CMD=/etc/session.d/user-session-modello:g $D/etc/tlm-singleseat.conf
+# tlm-config-ivi-singleseat-ico is problematic because of its
+# ico-uxf-homescreen dependency: that leads to a dependency on
+# pkgmgr-native, which does not compile because of its deep
+# dependency chain on recipes which all were never compiled
+# before natively. Many of them currently don't compile
+# because of broken dependencies.
+#
+# For now just disable it and focus on Modello instead.
+PACKAGES_remove = "${PN}-config-ivi-singleseat-ico"
+do_install_append() {
+    rm -rf ${tlm-config-ivi-singleseat-ico_files}
 }
 
-pkg_postinst_${PN}-config-ivi-multiseat() {
- ln -s -f /etc/tlm-multiseat.conf $D/etc/tlm.conf
-}
-
-pkg_postinst_${PN}-config-ivi-vtc1010() {
- ln -s -f /etc/tlm-vtc1010.conf $D/etc/tlm.conf
-}
-
-
-
-
-
-
-