Re-add crosswalk

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

diff --git a/recipes-image/config-image/config-image.bb b/recipes-image/config-image/config-image.bb
index 75386ac..c3baf90 100644 (file)
--- a/recipes-image/config-image/config-image.bb
+++ b/recipes-image/config-image/config-image.bb
@@ -14,9 +14,6 @@ do_install() {
   touch ${D}${sysconfdir}/environment
   chmod 0644 ${D}${sysconfdir}/environment
   
-  mkdir -p ${D}${localstatedir}
-  ln -s ${localstatedir}/volatile/log  ${D}${localstatedir}/log
-  
   mkdir -p ${D}${sysconfdir}/profile.d
 cat >${D}${sysconfdir}/profile.d/bash_prompt_custom.sh <<'EOF'
     # set a fancy prompt (overwrite the one in /etc/profile)
@@ -62,16 +59,20 @@ pkg_postinst_${PN} () {
   
   if [ "x$D" != "x" ]; then  
     cp -fra $D/lib/systemd  $D/usr/lib
+    cp -fra $D${localstatedir}/log $D${localstatedir}/volatile
     #cp -fra $D/sbin $D/usr
     #cp -fra $D/bin  $D/usr
   
     #rm -fr $D/lib
     #rm -fr $D/sbin
     #rm -fr $D/bin
-  
+    rm -fr $D${localstatedir}/log
+
     #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 volatile/log  $D${localstatedir}/log
  fi
 }
 

diff --git a/recipes-image/images/tizen-ivi-core-image.bb b/recipes-image/images/tizen-ivi-core-image.bb
index 9c9d4b1..ed38c98 100644 (file)
--- a/recipes-image/images/tizen-ivi-core-image.bb
+++ b/recipes-image/images/tizen-ivi-core-image.bb
@@ -50,7 +50,7 @@ CORE_IMAGE_EXTRA_INSTALL += "genivi-shell"
 CORE_IMAGE_EXTRA_INSTALL += "weston-ivi-shell"
 
 # Crosswalk
-#CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-crosswalk"
+CORE_IMAGE_EXTRA_INSTALL += "packagegroup-tizen-crosswalk"
 
 # Time zone
 CORE_IMAGE_EXTRA_INSTALL += "tzdata"