meta-tizen: Fix image ivi creation

Change-Id: Id35653654246847246895cec0171379ec83d649b
(From meta-tizen rev: 31328be841409b14dbedb6a789eb6a2260f66137)

Signed-off-by: Ronan Le Martret <ronan@fridu.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-tizen/recipes-image/config-image/config-image.bb b/meta-tizen/recipes-image/config-image/config-image.bb
index c3baf90..939f1c5 100644 (file)
--- a/meta-tizen/recipes-image/config-image/config-image.bb
+++ b/meta-tizen/recipes-image/config-image/config-image.bb
@@ -67,11 +67,12 @@ pkg_postinst_${PN} () {
     #rm -fr $D/sbin
     #rm -fr $D/bin
     rm -fr $D${localstatedir}/log
+    #rm -fr $D/usr/lib/systemd
 
     #ln -s usr/lib  $D/lib
     #ln -s usr/sbin $D/sbin
     #ln -s usr/bin  $D/bin
-    ln -s ../../lib/systemd  $D/usr/lib/systemd
+    #ln -s ../../lib/systemd  $D/usr/lib/systemd
     ln -s volatile/log  $D${localstatedir}/log
  fi
 }

diff --git a/meta-tizen/recipes-image/images/tizen-ivi-core-image.bb b/meta-tizen/recipes-image/images/tizen-ivi-core-image.bb
index ed38c98..4790731 100644 (file)
--- a/meta-tizen/recipes-image/images/tizen-ivi-core-image.bb
+++ b/meta-tizen/recipes-image/images/tizen-ivi-core-image.bb
@@ -23,12 +23,12 @@ CORE_IMAGE_EXTRA_INSTALL += "automotive-message-broker"
 CORE_IMAGE_EXTRA_INSTALL += "efl-theme-tizen-hd"
 CORE_IMAGE_EXTRA_INSTALL += "festival"
 CORE_IMAGE_EXTRA_INSTALL += "genivi-audio-manager"
-CORE_IMAGE_EXTRA_INSTALL += "ico-uxf-device-input-controller"
-CORE_IMAGE_EXTRA_INSTALL += "ico-uxf-homescreen"
-
-CORE_IMAGE_EXTRA_INSTALL += "ico-uxf-utilities"
-CORE_IMAGE_EXTRA_INSTALL += "ico-uxf-weston-plugin"
 
+#ico packages seems to be optional for IVI
+#CORE_IMAGE_EXTRA_INSTALL += "ico-uxf-device-input-controller"
+#CORE_IMAGE_EXTRA_INSTALL += "ico-uxf-homescreen"
+#CORE_IMAGE_EXTRA_INSTALL += "ico-uxf-utilities"
+#CORE_IMAGE_EXTRA_INSTALL += "ico-uxf-weston-plugin"
 #CORE_IMAGE_EXTRA_INSTALL += "ico-vic-amb-plugin"
 #CORE_IMAGE_EXTRA_INSTALL += "ico-vic-carsimulator"
 #CORE_IMAGE_EXTRA_INSTALL += "ico-uxf-homescreen-sample-apps"
@@ -38,6 +38,7 @@ CORE_IMAGE_EXTRA_INSTALL += "libwebsockets"
 CORE_IMAGE_EXTRA_INSTALL += "murphy"
 CORE_IMAGE_EXTRA_INSTALL += "node-startup-controller"
 CORE_IMAGE_EXTRA_INSTALL += "pulseaudio-module-murphy-ivi"
+CORE_IMAGE_EXTRA_INSTALL += "weston-ivi-config"
 # TMP Remove rygel
 # BTY-36
 #CORE_IMAGE_EXTRA_INSTALL += "rygel"