Merge branch 'tizen' of git.vannes:/srv/git/gitcache/review.tizen.org//scm/bb/meta-tizen into tizen

Conflicts:
	recipes-tizen/rpm/rpm-extraconf.inc

Change-Id: Ib44a1b0c91bfc4a969733ba909e1e7ad75f30624

6 files changed, 29 insertions, 8 deletions

diff --git a/recipes-tizen/ail/ail-extraconf.inc b/recipes-tizen/ail/ail-extraconf.inc
index a4a2cc18..26878a2e 100644
--- a/recipes-tizen/ail/ail-extraconf.inc
+++ b/recipes-tizen/ail/ail-extraconf.inc
@@ -8,3 +8,4 @@ DEPENDS_remove_class-native = "dlog-native"
 DEPENDS_class-target += "ail-native"
 DEPENDS_class-target += "libslp-db-util"
 DEPENDS_class-target += "xdgmime"
+DEPENDS_class-target += "vconf"
diff --git a/recipes-tizen/crosswalk/crosswalk-extraconf.inc b/recipes-tizen/crosswalk/crosswalk-extraconf.inc
index cf3f51b3..143316b9 100644
--- a/recipes-tizen/crosswalk/crosswalk-extraconf.inc
+++ b/recipes-tizen/crosswalk/crosswalk-extraconf.inc
@@ -16,6 +16,7 @@ COMPATIBLE_MACHINE_x86-64 = "(.*)"
 COMPATIBLE_MACHINE_armv6 = "(.*)"
 COMPATIBLE_MACHINE_armv7a = "(.*)"
 COMPATIBLE_MACHINE_romley-ivb = "(.*)"
+COMPATIBLE_MACHINE_valleyisland-64 = "(.*)"
 
 do_compile() {
  cd ${S}
diff --git a/recipes-tizen/crosswalk/crosswalk/valleyisland-64/include.gypi b/recipes-tizen/crosswalk/crosswalk/valleyisland-64/include.gypi
new file mode 100644
index 00000000..c2e2a7d8
--- /dev/null
+++ b/recipes-tizen/crosswalk/crosswalk/valleyisland-64/include.gypi
@@ -0,0 +1,5 @@
+{
+  'variables': {
+    'target_arch': 'x64',
+  }
+}
diff --git a/recipes-tizen/crosswalk/crosswalk/valleyisland-64/oe-defaults.gypi b/recipes-tizen/crosswalk/crosswalk/valleyisland-64/oe-defaults.gypi
new file mode 100644
index 00000000..0a6e8e86
--- /dev/null
+++ b/recipes-tizen/crosswalk/crosswalk/valleyisland-64/oe-defaults.gypi
@@ -0,0 +1,15 @@
+{
+  'variables': {
+    'use_system_bzip2': 1,
+    'disable_nacl': 1,
+    'proprietary_codecs': 0,
+    'v8_use_snapshot': 1,
+    'use_system_ffmpeg': 0,
+    'linux_use_tcmalloc': 1,
+    'linux_link_kerberos': 0,
+    'use_kerberos': 0,
+    'use_cups': 0,
+    'use_gnome_keyring': 0,
+    'linux_link_gnome_keyring': 0,
+  }, 
+}
diff --git a/recipes-tizen/rpm/rpm-extraconf.inc b/recipes-tizen/rpm/rpm-extraconf.inc
index 982aa884..bc7fd7cc 100644
--- a/recipes-tizen/rpm/rpm-extraconf.inc
+++ b/recipes-tizen/rpm/rpm-extraconf.inc
@@ -35,9 +35,9 @@ do_compile_prepend() {
  export CPPFLAGS
  export LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic-functions -ffunction-sections"
 
- export CCFLAGS+=" -fPIC "
- export CXXFLAGS+=" -fPIC "
- export CFLAGS+=" -fPIC "
+ export CCFLAGS="${CCFLAGS} -fPIC "
+ export CXXFLAGS="${CXXFLAGS} -fPIC "
+ export CFLAGS="${CFLAGS} -fPIC "
 
  cd db3
  ./configure --build=${TARGET_SYS} --host=x86_64-linux-gnu
@@ -45,7 +45,7 @@ do_compile_prepend() {
 
  cp db3/configure  db3/configure.ac
 
- export CFLAGS+=" -DRPM_VENDOR_OE "
+ export CFLAGS="${CFLAGS} -DRPM_VENDOR_OE "
 }
 
 do_compile() {
@@ -60,14 +60,11 @@ do_compile() {
   export CFLAGS="$CFLAGS -ffunction-sections"
   export LDFLAGS="${LDFLAGS} -Wl,-Bsymbolic-functions -ffunction-sections"
   
-  export CFLAGS+=" -DRPM_VENDOR_OE "
+  export CFLAGS="${CFLAGS} -DRPM_VENDOR_OE "
   autoreconf -i -f
   oe_runconf
   
   make ${PARALLEL_MAKE}
-  
-  
-  
 }
 
 EXTRA_OECONF += " --with-python-inc-dir=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} "
diff --git a/recipes-tizen/vconf/vconf-extraconf.inc b/recipes-tizen/vconf/vconf-extraconf.inc
index 2d3efb0e..a093a56e 100644
--- a/recipes-tizen/vconf/vconf-extraconf.inc
+++ b/recipes-tizen/vconf/vconf-extraconf.inc
@@ -6,6 +6,8 @@ DEPENDS_remove_class-native = "dlog-native"
 
 DEPENDS_class-target += "glib-2.0"
 DEPENDS_class-target += "vconf-native"
+DEPENDS_class-target += "vconf-internal-keys"
+DEPENDS_class-target += "dlog"
 
 do_install_append_class-native() {
  sed -i "s@source /etc/tizen-platform.conf@source ${sysconfdir}/tizen-platform.conf@g" ${D}${prefix}/bin/vconf-init