use DISTRO_FEATURES instead IMAGECONFIG for tlm

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

diff --git a/meta-tizen-common-base/conf/distro/tizen.conf b/meta-tizen-common-base/conf/distro/tizen.conf
index b782b5f..3974d8d 100644 (file)
--- a/meta-tizen-common-base/conf/distro/tizen.conf
+++ b/meta-tizen-common-base/conf/distro/tizen.conf
@@ -33,6 +33,7 @@ WESTONSTARTUP ??= "weston-common"
 IMAGECONFIG ??= "config-tizen-common"
 TLMCONFIG ??= "tlm-config-common"
 
+DISTRO_FEATURES += "tizen-common"
 
 PREFERRED_PROVIDER_python-dbus = "dbus-python"
 PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"

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 60dc2aa..5a42184 100644 (file)
--- a/meta-tizen-common-base/recipes-core/tlm/tlm-extraconf.inc
+++ b/meta-tizen-common-base/recipes-core/tlm/tlm-extraconf.inc
@@ -31,20 +31,18 @@ do_install() {
  install -m 755 -d ${D}${sysconfdir}/session.d
 
  
- if ${@bb.utils.contains('IMAGECONFIG','config-tizen-ivi','true','false',d)}; then
+ if ${@bb.utils.contains('DISTRO_FEATURES','tizen-ivi','true','false',d)}; then
   install -m 755 -d ${D}${sysconfdir}/xdg/weston
   install -m 644 data/tizen-ivi/etc/tlm*.conf ${D}${sysconfdir} 
   install -m 755 data/tizen-ivi/etc/session.d/* ${D}${sysconfdir}/session.d/
   install -m 644 data/tizen-ivi/weston-*.ini ${D}${sysconfdir}/xdg/weston/
   install -m 755 -d ${D}${sysconfdir}/udev/rules.d
   install -m 644 data/tizen-ivi/10-multiseat-vtc1010.rules ${D}${sysconfdir}/udev/rules.d/
- fi
- if ${@bb.utils.contains('IMAGECONFIG','config-tizen-common','true','false',d)}; then
+ elif ${@bb.utils.contains('DISTRO_FEATURES','tizen-common','true','false',d)}; then
   install -m 644 data/tizen-common/etc/tlm.conf ${D}${sysconfdir}
   install -m 755 data/tizen-common/etc/session.d/* ${D}${sysconfdir}/session.d/
  fi
  
- 
 }
 
 PACKAGES += " ${PN}-conf"

diff --git a/meta-tizen-ivi/conf/distro/tizen-ivi.conf b/meta-tizen-ivi/conf/distro/tizen-ivi.conf
index 5570c5d..454d8e4 100644 (file)
--- a/meta-tizen-ivi/conf/distro/tizen-ivi.conf
+++ b/meta-tizen-ivi/conf/distro/tizen-ivi.conf
@@ -4,4 +4,6 @@ DISTRO = "tizen-ivi"
 # Use weston from Tizen since it contains Tizen specific patches
 WESTONSTARTUP = "weston-ivi"
 IMAGECONFIG = "config-tizen-ivi"
-TLMCONFIG = "tlm-config-ivi-singleseat"
\ No newline at end of file
+TLMCONFIG = "tlm-config-ivi-singleseat"
+
+DISTRO_FEATURES += "tizen-ivi"
\ No newline at end of file