recipes: re-generate with %profile ivi

spec2yocto was using %profile pc before. Fixing that leads
to a different result for a number of projects.

In addition, the slightly more recent tizen-ivi_20150128.1_atom.xml was used,
bringing in a new revision of Crosswalk.

Change-Id: I14b8bbc00c507d41f286038e774e16c8c54841db

diff --git a/meta-tizen-common-base/recipes-connectivity/bluetooth-frwk/bluetooth-frwk.inc b/meta-tizen-common-base/recipes-connectivity/bluetooth-frwk/bluetooth-frwk.inc
index 94caef2..6b7e257 100644 (file)
--- a/meta-tizen-common-base/recipes-connectivity/bluetooth-frwk/bluetooth-frwk.inc
+++ b/meta-tizen-common-base/recipes-connectivity/bluetooth-frwk/bluetooth-frwk.inc
@@ -143,6 +143,7 @@ do_install() {
  install -m 0644 ${S}/packaging/bt-icon.png ${D}${prefix}/share/icons/default/bt-icon.png
  
  # On IVI bt-service needs to be run as 'app' even if there is a 'guest' user.
+ sed -i 's/app/app/' ${D}${prefix}/share/dbus-1/system-services/org.projectx.bt.service
  
  
 }

diff --git a/meta-tizen-common-base/recipes-core/systemd/systemd.inc b/meta-tizen-common-base/recipes-core/systemd/systemd.inc
index 0ca3407..affe576 100644 (file)
--- a/meta-tizen-common-base/recipes-core/systemd/systemd.inc
+++ b/meta-tizen-common-base/recipes-core/systemd/systemd.inc
@@ -238,7 +238,7 @@ EOF
  
  rm -rf ${D}${systemd_unitdir}/system/default.target
  install -m 755 -d ${D}${systemd_unitdir}/system
- install -m 644 ${S}/packaging/default.target ${D}${systemd_unitdir}/system/
+ install -m 644 ${S}/packaging/default.target.ivi ${D}${systemd_unitdir}/system/default.target
  
  rm -rf ${D}${prefix}/share/doc/packages/systemd
  

diff --git a/meta-tizen-common-base/recipes-core/tlm/tlm.inc b/meta-tizen-common-base/recipes-core/tlm/tlm.inc
index ce8a976..a19d755 100644 (file)
--- a/meta-tizen-common-base/recipes-core/tlm/tlm.inc
+++ b/meta-tizen-common-base/recipes-core/tlm/tlm.inc
@@ -13,40 +13,86 @@ inherit manifest autotools-brokensep
 BBCLASSEXTEND = ""
 PROVIDES = ""
 
-#PROVIDES by tlm-config-common
-PROVIDES += "tlm-config-common"
+#PROVIDES by tlm-config-ivi-vtc1010
+PROVIDES += "tlm-config-ivi-vtc1010"
 # the PROVIDES rules is ignore "tlm-config  "
 PROVIDES += "tlm-config"
-RPROVIDES_tlm-config-common += "tlm-config"
+RPROVIDES_tlm-config-ivi-vtc1010 += "tlm-config"
 
 
-#PROVIDES by tlm-dev
-PROVIDES += "tlm-dev"
+#PROVIDES by tlm-config-ivi-singleseat
+PROVIDES += "tlm-config-ivi-singleseat"
+# the PROVIDES rules is ignore "tlm-config  "
+PROVIDES += "tlm-config"
+RPROVIDES_tlm-config-ivi-singleseat += "tlm-config"
 
 
-#PROVIDES by tlm
+#PROVIDES by tlm-config-ivi-multiseat
+PROVIDES += "tlm-config-ivi-multiseat"
+# the PROVIDES rules is ignore "tlm-config  "
+PROVIDES += "tlm-config"
+RPROVIDES_tlm-config-ivi-multiseat += "tlm-config"
+
+
+#PROVIDES by tlm-config-ivi-singleseat-modello
+PROVIDES += "tlm-config-ivi-singleseat-modello"
+# the PROVIDES rules is ignore "tlm-config  "
+PROVIDES += "tlm-config"
+RPROVIDES_tlm-config-ivi-singleseat-modello += "tlm-config"
+
+
+#PROVIDES by tlm-dev
+PROVIDES += "tlm-dev"
 
 
 #PROVIDES by tlm-doc
 PROVIDES += "tlm-doc"
 
 
+#PROVIDES by tlm-config-ivi-singleseat-ico
+PROVIDES += "tlm-config-ivi-singleseat-ico"
+# the PROVIDES rules is ignore "tlm-config  "
+PROVIDES += "tlm-config"
+RPROVIDES_tlm-config-ivi-singleseat-ico += "tlm-config"
+
+
+#PROVIDES by tlm
+
+
 RDEPENDS = ""
-#RDEPENDS of tlm-config-common (${PN}-config-common)
-RDEPENDS_${PN}-config-common += "tlm"
+#RDEPENDS of tlm-config-ivi-vtc1010 (${PN}-config-ivi-vtc1010)
+RDEPENDS_${PN}-config-ivi-vtc1010 += "weekeyboard"
+RDEPENDS_${PN}-config-ivi-vtc1010 += "tlm"
+
+#RDEPENDS of tlm-config-ivi-singleseat (${PN}-config-ivi-singleseat)
+RDEPENDS_${PN}-config-ivi-singleseat += "weekeyboard"
+RDEPENDS_${PN}-config-ivi-singleseat += "tlm"
+
+#RDEPENDS of tlm-config-ivi-multiseat (${PN}-config-ivi-multiseat)
+RDEPENDS_${PN}-config-ivi-multiseat += "weekeyboard"
+RDEPENDS_${PN}-config-ivi-multiseat += "tlm"
+
+#RDEPENDS of tlm-config-ivi-singleseat-modello (${PN}-config-ivi-singleseat-modello)
+RDEPENDS_${PN}-config-ivi-singleseat-modello += "weekeyboard"
+RDEPENDS_${PN}-config-ivi-singleseat-modello += "Modello-Installer-xwalk"
+RDEPENDS_${PN}-config-ivi-singleseat-modello += "tlm"
 
 #RDEPENDS of tlm-dev (${PN}-dev)
 RDEPENDS_${PN}-dev += "tlm"
 
+#RDEPENDS of tlm-doc (${PN}-doc)
+RDEPENDS_${PN}-doc += "tlm"
+
+#RDEPENDS of tlm-config-ivi-singleseat-ico (${PN}-config-ivi-singleseat-ico)
+RDEPENDS_${PN}-config-ivi-singleseat-ico += "tlm"
+RDEPENDS_${PN}-config-ivi-singleseat-ico += "ico-uxf-homescreen"
+
 #RDEPENDS of tlm (${PN})
 RDEPENDS_${PN} += "libsystemd"
 RDEPENDS_${PN} += "glibc"
 RDEPENDS_${PN} += "systemd"
 RDEPENDS_${PN} += "gumd"
 
-#RDEPENDS of tlm-doc (${PN}-doc)
-RDEPENDS_${PN}-doc += "tlm"
-
 
 DEPENDS = ""
 #DEPENDS of tlm
@@ -115,8 +161,14 @@ do_install() {
  install -m 644 data/tlm-default-login ${D}${sysconfdir}/pam.d/
  install -m 644 data/tlm-system-login ${D}${sysconfdir}/pam.d/
  install -m 755 -d ${D}${sysconfdir}/session.d
- install -m 644 data/tizen-common/etc/tlm.conf ${D}${sysconfdir}
- install -m 755 data/tizen-common/etc/session.d/* ${D}${sysconfdir}/session.d/
+ 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/etc/xdg/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/
+ install -m 755 -d ${D}${sysconfdir}/profile.d
+ install -m 644 data/tizen-ivi/etc/profile.d/* ${D}${sysconfdir}/profile.d/
  
  
  
@@ -125,6 +177,9 @@ do_install() {
 pkg_postinst_${PN}() {
     #!/bin/sh -e
 
+    if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+       ln -s -f /etc/tlm-singleseat-modello.conf /etc/tlm.conf
+    fi
     systemctl enable tlm
     systemctl daemon-reload
 
@@ -137,6 +192,70 @@ pkg_postinst_${PN}() {
 
 }
 
+pkg_postinst_${PN}() {
+    #!/bin/sh -e
+
+    if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+       ln -s -f /etc/tlm-multiseat.conf /etc/tlm.conf
+    fi
+    systemctl enable tlm
+    systemctl daemon-reload
+
+}
+
+pkg_postinst_${PN}() {
+    #!/bin/sh -e
+
+    if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+       ln -s -f /etc/tlm-singleseat-ico.conf /etc/tlm.conf
+    fi
+    systemctl enable tlm
+    systemctl daemon-reload
+
+}
+
+pkg_postinst_${PN}() {
+    #!/bin/sh -e
+
+    if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+       ln -s -f /etc/tlm-singleseat.conf /etc/tlm.conf
+    fi
+    systemctl enable tlm
+    systemctl daemon-reload
+
+}
+
+pkg_postinst_${PN}() {
+    #!/bin/sh -e
+
+    if [ ! -e /etc/tlm.conf ] || [ -h /etc/tlm.conf ]; then
+       ln -s -f /etc/tlm-vtc1010.conf /etc/tlm.conf
+    fi
+    systemctl enable tlm
+    systemctl daemon-reload
+
+}
+
+pkg_prerm_${PN}() {
+    #!/bin/sh -e
+
+    if [ $1 == 0 ]; then
+       systemctl disable tlm
+       systemctl daemon-reload
+    fi
+
+}
+
+pkg_prerm_${PN}() {
+    #!/bin/sh -e
+
+    if [ $1 == 0 ]; then
+       systemctl disable tlm
+       systemctl daemon-reload
+    fi
+
+}
+
 pkg_prerm_${PN}() {
     #!/bin/sh -e
 
@@ -147,6 +266,62 @@ pkg_prerm_${PN}() {
 
 }
 
+pkg_prerm_${PN}() {
+    #!/bin/sh -e
+
+    if [ $1 == 0 ]; then
+       systemctl disable tlm
+       systemctl daemon-reload
+    fi
+
+}
+
+pkg_prerm_${PN}() {
+    #!/bin/sh -e
+
+    if [ $1 == 0 ]; then
+       systemctl disable tlm
+       systemctl daemon-reload
+    fi
+
+}
+
+pkg_postrm_${PN}() {
+    #!/bin/sh -e
+
+    if [ -h /etc/tlm.conf ] && [ $1 == 0 ]; then
+       rm -f /etc/tlm.conf
+    fi
+
+}
+
+pkg_postrm_${PN}() {
+    #!/bin/sh -e
+
+    if [ -h /etc/tlm.conf ] && [ $1 == 0 ]; then
+       rm -f /etc/tlm.conf
+    fi
+
+}
+
+pkg_postrm_${PN}() {
+    #!/bin/sh -e
+
+    if [ -h /etc/tlm.conf ] && [ $1 == 0 ]; then
+       rm -f /etc/tlm.conf
+    fi
+
+}
+
+pkg_postrm_${PN}() {
+    #!/bin/sh -e
+
+    if [ -h /etc/tlm.conf ] && [ $1 == 0 ]; then
+       rm -f /etc/tlm.conf
+    fi
+
+}
+
 pkg_postrm_${PN}() {
     #!/bin/sh -e
 
@@ -163,20 +338,68 @@ pkg_postrm_${PN}() {
 }
 
 PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale"
-PACKAGES += " tlm-config-common "
+PACKAGES += " tlm-config-ivi-vtc1010 "
+PACKAGES += " tlm-config-ivi-singleseat "
+PACKAGES += " tlm-config-ivi-multiseat "
+PACKAGES += " tlm-config-ivi-singleseat-modello "
 PACKAGES += " tlm-dev "
+PACKAGES += " tlm-config-ivi-singleseat-ico "
 PACKAGES += " tlm "
 
-tlm-config-common_files = ""
-tlm-config-common_files += "${sysconfdir}/tlm.conf"
-tlm-config-common_files += "${sysconfdir}/session.d/*"
-MANIFESTFILES_${PN}-config-common = "tlm.manifest"
+tlm-config-ivi-vtc1010_files = ""
+tlm-config-ivi-vtc1010_files += "${sysconfdir}/tlm-vtc1010.conf"
+tlm-config-ivi-vtc1010_files += "${sysconfdir}/session.d/genivi-session-vtc1010"
+tlm-config-ivi-vtc1010_files += "${sysconfdir}/session.d/user-session"
+tlm-config-ivi-vtc1010_files += "${sysconfdir}/xdg/weston/weston-genivi-vtc1010.ini"
+tlm-config-ivi-vtc1010_files += "${sysconfdir}/xdg/weston/weston-user.ini"
+tlm-config-ivi-vtc1010_files += "${sysconfdir}/udev/rules.d/*"
+tlm-config-ivi-vtc1010_files += "${sysconfdir}/profile.d/weston-env-ivi.sh"
+MANIFESTFILES_${PN}-config-ivi-vtc1010 = "tlm.manifest"
+
+tlm-config-ivi-singleseat_files = ""
+tlm-config-ivi-singleseat_files += "${sysconfdir}/tlm-singleseat.conf"
+tlm-config-ivi-singleseat_files += "${sysconfdir}/session.d/genivi-session-singleseat"
+tlm-config-ivi-singleseat_files += "${sysconfdir}/session.d/user-session"
+tlm-config-ivi-singleseat_files += "${sysconfdir}/xdg/weston/weston-genivi.ini"
+tlm-config-ivi-singleseat_files += "${sysconfdir}/xdg/weston/weston-user.ini"
+tlm-config-ivi-singleseat_files += "${sysconfdir}/profile.d/weston-env-ivi.sh"
+MANIFESTFILES_${PN}-config-ivi-singleseat = "tlm.manifest"
+
+tlm-config-ivi-multiseat_files = ""
+tlm-config-ivi-multiseat_files += "${sysconfdir}/tlm-multiseat.conf"
+tlm-config-ivi-multiseat_files += "${sysconfdir}/session.d/genivi-session-multiseat"
+tlm-config-ivi-multiseat_files += "${sysconfdir}/session.d/user-session"
+tlm-config-ivi-multiseat_files += "${sysconfdir}/xdg/weston/weston-genivi.ini"
+tlm-config-ivi-multiseat_files += "${sysconfdir}/xdg/weston/weston-user.ini"
+tlm-config-ivi-multiseat_files += "${sysconfdir}/profile.d/weston-env-ivi.sh"
+MANIFESTFILES_${PN}-config-ivi-multiseat = "tlm.manifest"
+
+tlm-config-ivi-singleseat-modello_files = ""
+tlm-config-ivi-singleseat-modello_files += "${sysconfdir}/tlm-singleseat-modello.conf"
+tlm-config-ivi-singleseat-modello_files += "${sysconfdir}/session.d/genivi-session-modello"
+tlm-config-ivi-singleseat-modello_files += "${sysconfdir}/session.d/user-session-modello"
+tlm-config-ivi-singleseat-modello_files += "${sysconfdir}/xdg/weston/weston-genivi-modello.ini"
+tlm-config-ivi-singleseat-modello_files += "${sysconfdir}/xdg/weston/weston-user-modello.ini"
+tlm-config-ivi-singleseat-modello_files += "${sysconfdir}/profile.d/weston-env-ivi.sh"
+MANIFESTFILES_${PN}-config-ivi-singleseat-modello = "tlm.manifest"
 
 tlm-dev_files = ""
 tlm-dev_files += "${prefix}/include/tlm/*.h"
 tlm-dev_files += "${prefix}/lib/libtlm*.so"
 tlm-dev_files += "${prefix}/lib/pkgconfig/tlm.pc"
 
+tlm-doc_files = ""
+tlm-doc_files += "${prefix}/share/gtk-doc/html/tlm/*"
+
+tlm-config-ivi-singleseat-ico_files = ""
+tlm-config-ivi-singleseat-ico_files += "${sysconfdir}/tlm-singleseat-ico.conf"
+tlm-config-ivi-singleseat-ico_files += "${sysconfdir}/session.d/genivi-session-singleseat"
+tlm-config-ivi-singleseat-ico_files += "${sysconfdir}/session.d/user-session-ico"
+tlm-config-ivi-singleseat-ico_files += "${sysconfdir}/xdg/weston/weston-genivi.ini"
+tlm-config-ivi-singleseat-ico_files += "${sysconfdir}/xdg/weston/weston-user.ini"
+tlm-config-ivi-singleseat-ico_files += "${sysconfdir}/profile.d/weston-env-ivi.sh"
+MANIFESTFILES_${PN}-config-ivi-singleseat-ico = "tlm.manifest"
+
 tlm_files = ""
 tlm_files += "AUTHORS NEWS README"
 tlm_files += "${prefix}/bin/tlm"
@@ -195,18 +418,23 @@ CONFFILES_${PN} += "${sysconfdir}/pam.d/tlm-default-login"
 CONFFILES_${PN} += "${sysconfdir}/pam.d/tlm-system-login"
 MANIFESTFILES_${PN} = "tlm.manifest"
 
-tlm-doc_files = ""
-tlm-doc_files += "${prefix}/share/gtk-doc/html/tlm/*"
-
-FILES_${PN}-config-common = "${tlm-config-common_files}"
+FILES_${PN}-config-ivi-vtc1010 = "${tlm-config-ivi-vtc1010_files}"
+FILES_${PN}-config-ivi-singleseat = "${tlm-config-ivi-singleseat_files}"
+FILES_${PN}-config-ivi-multiseat = "${tlm-config-ivi-multiseat_files}"
+FILES_${PN}-config-ivi-singleseat-modello = "${tlm-config-ivi-singleseat-modello_files}"
 FILES_${PN}-dev = "${tlm-dev_files}"
-FILES_${PN} = "${tlm_files}"
 FILES_${PN}-doc = "${tlm-doc_files}"
+FILES_${PN}-config-ivi-singleseat-ico = "${tlm-config-ivi-singleseat-ico_files}"
+FILES_${PN} = "${tlm_files}"
 
-PKG_tlm-config-common= "tlm-config-common"
+PKG_tlm-config-ivi-vtc1010= "tlm-config-ivi-vtc1010"
+PKG_tlm-config-ivi-singleseat= "tlm-config-ivi-singleseat"
+PKG_tlm-config-ivi-multiseat= "tlm-config-ivi-multiseat"
+PKG_tlm-config-ivi-singleseat-modello= "tlm-config-ivi-singleseat-modello"
 PKG_tlm-dev= "tlm-dev"
-PKG_tlm= "tlm"
 PKG_tlm-doc= "tlm-doc"
+PKG_tlm-config-ivi-singleseat-ico= "tlm-config-ivi-singleseat-ico"
+PKG_tlm= "tlm"
 
 require tlm-extraconf.inc
 

diff --git a/meta-tizen-common-base/recipes-graphics/weston/weston.inc b/meta-tizen-common-base/recipes-graphics/weston/weston.inc
index 4171d46..59566e3 100644 (file)
--- a/meta-tizen-common-base/recipes-graphics/weston/weston.inc
+++ b/meta-tizen-common-base/recipes-graphics/weston/weston.inc
@@ -96,7 +96,7 @@ do_compile() {
   
   
 }
-EXTRA_OECONF += " --disable-static --disable-setuid-install --enable-simple-clients --enable-clients --disable-libunwind --disable-xwayland --disable-xwayland-test --disable-x11-compositor --disable-rpi-compositor --with-cairo=glesv2 "
+EXTRA_OECONF += " --disable-static --disable-setuid-install --enable-simple-clients --enable-clients --disable-libunwind --disable-xwayland --disable-xwayland-test --disable-x11-compositor --disable-rpi-compositor --with-cairo=glesv2 --disable-default-vkb --enable-transform"
 
 do_install() {
  export RPM_BUILD_ROOT=${D}

diff --git a/meta-tizen-common-devtools/recipes-devtools/ivi-sanity-suite/ivi-sanity-suite.inc b/meta-tizen-common-devtools/recipes-devtools/ivi-sanity-suite/ivi-sanity-suite.inc
index f1c7330..e4cfe72 100644 (file)
--- a/meta-tizen-common-devtools/recipes-devtools/ivi-sanity-suite/ivi-sanity-suite.inc
+++ b/meta-tizen-common-devtools/recipes-devtools/ivi-sanity-suite/ivi-sanity-suite.inc
@@ -70,12 +70,12 @@ do_install() {
  rm -rf ${D}
  mkdir -p ${D}
  
- install -d ${D}${prefix}/share/tests/pc/ivi-sanity-suite
- install -m 0755 runtest ${D}${prefix}/share/tests/pc/ivi-sanity-suite
- install -m 0755 process_check/prs_checker ${D}${prefix}/share/tests/pc/ivi-sanity-suite
- install -m 0644 process_check/testkit.xml ${D}${prefix}/share/tests/pc/ivi-sanity-suite
- install -m 0644 LICENSE ${D}${prefix}/share/tests/pc/ivi-sanity-suite
- install -m 0644 process_check/README ${D}${prefix}/share/tests/pc/ivi-sanity-suite
+ install -d ${D}${prefix}/share/tests/ivi/ivi-sanity-suite
+ install -m 0755 runtest ${D}${prefix}/share/tests/ivi/ivi-sanity-suite
+ install -m 0755 process_check/prs_checker ${D}${prefix}/share/tests/ivi/ivi-sanity-suite
+ install -m 0644 process_check/testkit.xml ${D}${prefix}/share/tests/ivi/ivi-sanity-suite
+ install -m 0644 LICENSE ${D}${prefix}/share/tests/ivi/ivi-sanity-suite
+ install -m 0644 process_check/README ${D}${prefix}/share/tests/ivi/ivi-sanity-suite
  
  install -d ${D}${prefix}/share/tests/ivi/ivi-sanity-suite/GUI
  install -m 0755 GUI/runtest.sh ${D}${prefix}/share/tests/ivi/ivi-sanity-suite/GUI

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty.inc b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty.inc
index ee5d4d8..eb16d6b 100644 (file)
--- a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty.inc
+++ b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty.inc
@@ -45,6 +45,7 @@ DEPENDS += "libcap"
 DEPENDS += "flex"
 DEPENDS += "gperf"
 inherit pythonnative
+DEPENDS += "murphy"
 DEPENDS += "python-xml"
 DEPENDS_append_class-native = " ninja-native"
 DEPENDS_append_class-target = " ninja-native"
@@ -144,6 +145,7 @@ do_compile() {
  # So force it.
  
  
+ GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Denable_murphy=1"
  
  
  # --no-parallel is added because chroot does not mount a /dev/shm, this will

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty_git.bb b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty_git.bb
index b26cf63..9514640 100644 (file)
--- a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty_git.bb
+++ b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk-thirdparty_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/framework/web/crosswalk;tag=1b651e0c0c92d7e7ed27e563c95a832c2f210a68;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/framework/web/crosswalk;tag=4b0df18728c2254b370c0c10f9a826b84b48e112;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk.inc b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk.inc
index 196ea12..059a0a9 100644 (file)
--- a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk.inc
+++ b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk.inc
@@ -69,6 +69,7 @@ DEPENDS += "freetype"
 DEPENDS += "gperf"
 inherit pythonnative
 DEPENDS += "tizen-platform-config"
+DEPENDS += "murphy"
 DEPENDS += "pkgmgr-info"
 DEPENDS += "glib-2.0"
 DEPENDS += "libdrm"
@@ -183,6 +184,7 @@ do_compile() {
  # So force it.
  
  
+ GYP_EXTRA_FLAGS="${GYP_EXTRA_FLAGS} -Denable_murphy=1"
  
  # --no-parallel is added because chroot does not mount a /dev/shm, this will
  # cause python multiprocessing.SemLock error.

diff --git a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk_git.bb b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk_git.bb
index ba40efe..eb3a330 100644 (file)
--- a/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk_git.bb
+++ b/meta-tizen-common-share/recipes-crosswalk/crosswalk/crosswalk_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/framework/web/crosswalk;tag=1b651e0c0c92d7e7ed27e563c95a832c2f210a68;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/framework/web/crosswalk;tag=4b0df18728c2254b370c0c10f9a826b84b48e112;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc b/meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc
index da63523..da37c33 100644 (file)
--- a/meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc
+++ b/meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk.inc
@@ -70,6 +70,7 @@ DEPENDS += "capi-system-runtime-info"
 DEPENDS += "libtapi"
 DEPENDS += "capi-web-favorites"
 DEPENDS += "capi-appfw-app-manager"
+DEPENDS += "pkgconfig(automotive-message-broker)"
 inherit pythonnative
 DEPENDS += "evas"
 DEPENDS += "tizen-platform-config"
@@ -118,7 +119,7 @@ do_compile() {
  
  
  export GYP_GENERATORS='ninja'
- GYP_OPTIONS="--depth=. -Dtizen=1 -Dextension_build_type=Debug -Dextension_host_os=pc"
+ GYP_OPTIONS="--depth=. -Dtizen=1 -Dextension_build_type=Debug -Dextension_host_os=ivi"
  
  GYP_OPTIONS="$GYP_OPTIONS -Ddisplay_type=wayland"