Rebase recipies to common q1 2015

Change-Id: If70c5c84e133fb2ba96c557136b04cb86b8bb1f7
Signed-off-by: Jean-Benoit MARTIN <jean-benoit.martin@open.eurogiciel.org>

diff --git a/meta-tizen-common-base/recipes-application-framework/app-installers/app-installers_git.bb b/meta-tizen-common-base/recipes-application-framework/app-installers/app-installers_git.bb
index 5dcb8dc..85614a4 100644 (file)
--- a/meta-tizen-common-base/recipes-application-framework/app-installers/app-installers_git.bb
+++ b/meta-tizen-common-base/recipes-application-framework/app-installers/app-installers_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/appfw/app-installers;tag=8fd471e4be4460278b9fa2ae6eb79cf0746c8a7d;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/appfw/app-installers;tag=959fe7a29ed106aec1a9000810b6212be461ab3d;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/meta-tizen-common-base/recipes-application-framework/app-svc/app-svc_git.bb b/meta-tizen-common-base/recipes-application-framework/app-svc/app-svc_git.bb
index 66651b1..e612f40 100644 (file)
--- a/meta-tizen-common-base/recipes-application-framework/app-svc/app-svc_git.bb
+++ b/meta-tizen-common-base/recipes-application-framework/app-svc/app-svc_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/core/appfw/app-svc;tag=859ec161b49125408a7c74cacc29e78ad27d9a3c;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/app-svc;tag=d95dbdd84bb3aa893ea3e5042ce7a4684f85f4e6;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/meta-tizen-common-base/recipes-core/tizen-platform-wrapper/tizen-platform-wrapper_git.bb b/meta-tizen-common-base/recipes-core/tizen-platform-wrapper/tizen-platform-wrapper_git.bb
index 19e16c2..5273804 100644 (file)
--- a/meta-tizen-common-base/recipes-core/tizen-platform-wrapper/tizen-platform-wrapper_git.bb
+++ b/meta-tizen-common-base/recipes-core/tizen-platform-wrapper/tizen-platform-wrapper_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/core/appfw/tizen-platform-wrapper;tag=8b5967cd28a02dd169920f84722d5946d76b1690;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/appfw/tizen-platform-wrapper;tag=ce8e849a4632d168e420065445dbdc43df061a8a;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/meta-tizen-common-base/recipes-core/tlm/tlm_git.bb b/meta-tizen-common-base/recipes-core/tlm/tlm_git.bb
index 9d02910..09d8386 100644 (file)
--- a/meta-tizen-common-base/recipes-core/tlm/tlm_git.bb
+++ b/meta-tizen-common-base/recipes-core/tlm/tlm_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/core/system/tlm;tag=7263310cce0fe67af21c63eeecfa776778da8b08;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/system/tlm;tag=ca9819dadf03e53374560464298720583319e0ef;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/meta-tizen-common-base/recipes-multimedia/media-server/media-server_git.bb b/meta-tizen-common-base/recipes-multimedia/media-server/media-server_git.bb
index 30197b6..a429a10 100644 (file)
--- a/meta-tizen-common-base/recipes-multimedia/media-server/media-server_git.bb
+++ b/meta-tizen-common-base/recipes-multimedia/media-server/media-server_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/core/multimedia/media-server;tag=ca93eb1f529cab34a461422d7e22b893d827f9e5;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/multimedia/media-server;tag=a9149080381795b5eaf2c9ef0d904ded1a46ad50;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/meta-tizen-common-base/recipes-security/buxton/buxton_git.bb b/meta-tizen-common-base/recipes-security/buxton/buxton_git.bb
index f2374a9..8bc6d12 100644 (file)
--- a/meta-tizen-common-base/recipes-security/buxton/buxton_git.bb
+++ b/meta-tizen-common-base/recipes-security/buxton/buxton_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/upstream/buxton;tag=a707d0bd523c07c9c813a6cfa058f842ad335112;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/buxton;tag=e113af469291708b73b3f7fe0b3b838fbb8ac2b4;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/meta-tizen-common-base/recipes-security/cynara/cynara.inc b/meta-tizen-common-base/recipes-security/cynara/cynara.inc
index 9ada02a..0680dae 100644 (file)
--- a/meta-tizen-common-base/recipes-security/cynara/cynara.inc
+++ b/meta-tizen-common-base/recipes-security/cynara/cynara.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Cynara service with client libraries"
 HOMEPAGE = "http://nohomepage.org"
 SECTION = "Security/Application Privilege"
 LICENSE = "Apache-2.0"
-PV = "0.5.0"
+PV = "0.6.1"
 
 SRC_URI = ""
 
@@ -13,6 +13,9 @@ inherit manifest autotools-brokensep
 BBCLASSEXTEND = ""
 PROVIDES = ""
 
+CXXFLAGS_prepend = " -DCYNARA_STATE_PATH='\"${localstatedir}/cynara/\"' -DCYNARA_LIB_PATH='\"${prefix}/lib/cynara/\"' -DCYNARA_TESTS_DIR='\"${prefix}/share/cynara/tests/\"' -DCYNARA_CONFIGURATION_DIR='\"${sysconfdir}/cynara/\"' -DCYNARA_VERSION='\"0.6.1\"'"
+
+
 #PROVIDES by libcynara-creds-socket
 PROVIDES += "libcynara-creds-socket"
 
@@ -109,6 +112,9 @@ inherit pkgconfig
 DEPENDS += "gmock"
 DEPENDS += "gtest"
 
+CFLAGS_prepend = "-I ${S}/include "
+
+
 do_prep() {
  cd ${S}
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
@@ -125,6 +131,7 @@ do_prep() {
  cp -a ${S}/packaging/libcynara-session.manifest .
  cp -a ${S}/packaging/cynara-db-migration.manifest .
  cp -a ${S}/packaging/cyad.manifest .
+ cp -a ${S}/packaging/cynara-db-chsgen.manifest .
  cp -a test/db/db* .
  
  
@@ -148,7 +155,10 @@ do_compile() {
  export CXXFLAGS="$CXXFLAGS -DCYNARA_STATE_PATH=\\\"${localstatedir}/cynara/\\\" \
                             -DCYNARA_LIB_PATH=\\\"${prefix}/lib/cynara/\\\" \
                             -DCYNARA_TESTS_DIR=\\\"${prefix}/share/cynara/tests/\\\" \
-                            -DCYNARA_CONFIGURATION_DIR=\\\"${sysconfdir}/cynara/\\\""
+                            -DCYNARA_CONFIGURATION_DIR=\\\"${sysconfdir}/cynara/\\\" \
+                            -DCYNARA_VERSION=\\\"${PV}\\\""
+
+
  export LDFLAGS="${LDFLAGS} -Wl,--rpath=${prefix}/lib "
  
  
@@ -166,7 +176,8 @@ do_compile() {
          ${EXTRA_OECMAKE} . \
          -DBUILD_TESTS=OFF \
          -DCMAKE_BUILD_TYPE=RELEASE \
-         -DCMAKE_VERBOSE_MAKEFILE=ON
+         -DCMAKE_VERBOSE_MAKEFILE=ON \
+         -DDB_FILES_SMACK_LABEL="System"
          
 oe_runmake
  
@@ -224,9 +235,9 @@ pkg_preinst_${PN}() {
     fi
     if [ $1 -gt 1 ] ; then
         OLDVERSION="$(rpm -q --qf '%{version}' cynara)"
-        $D${prefix}/sbin/cynara/cynara-db-migration.sh upgrade -f ${OLDVERSION} -t 0.5.0
+        $D${prefix}/sbin/cynara/cynara-db-migration.sh upgrade -f 0.0.0 -t ${PV}
     else
-        $D${prefix}/sbin/cynara/cynara-db-migration.sh install -t 0.5.0
+        $D${prefix}/sbin/cynara/cynara-db-migration.sh install -t ${PV}
     fi
 
 }
@@ -332,7 +343,7 @@ pkg_postrm_${PN}() {
     #!/bin/sh -e
 
     if [ $1 = 0 ]; then
-        $D${prefix}/sbin/cynara/cynara-db-migration.sh uninstall -f 0.5.0
+        $D${prefix}/sbin/cynara/cynara-db-migration.sh uninstall -f ${PV}
         userdel -r cynara > /dev/null 2>&1
         groupdel cynara > /dev/null 2>&1
         systemctl daemon-reload
@@ -381,6 +392,7 @@ PACKAGES += " libcynara-session "
 
 cynara-tests_files = ""
 cynara-tests_files += "/usr/bin/cynara-tests"
+cynara-tests_files += "/usr/bin/cynara-db-migration-tests"
 cynara-tests_files += "${prefix}/share/cynara/tests/db*/*"
 cynara-tests_files += "%attr(755,root,root) ${prefix}/share/cynara/tests/empty_db"
 MANIFESTFILES_${PN}-tests = "cynara-tests.manifest"
@@ -402,6 +414,7 @@ MANIFESTFILES_lib${PN}-creds-dbus = "libcynara-creds-dbus.manifest"
 
 cynara-db-migration_files = ""
 cynara-db-migration_files += "${prefix}/sbin/cynara/cynara-db-migration.sh"
+cynara-db-migration_files += "${prefix}/sbin/cynara/cynara-db-chsgen.sh"
 MANIFESTFILES_${PN}-db-migration = "cynara-db-migration.manifest"
 
 cynara-dev_files = ""

diff --git a/meta-tizen-common-base/recipes-security/cynara/cynara_git.bb b/meta-tizen-common-base/recipes-security/cynara/cynara_git.bb
index ca0e0e2..0b3da89 100644 (file)
--- a/meta-tizen-common-base/recipes-security/cynara/cynara_git.bb
+++ b/meta-tizen-common-base/recipes-security/cynara/cynara_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/core/security/cynara;tag=6c079ffeed2e4dc0c8cec00e5a7da67f3c5e2564;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/security/cynara;tag=229ec1e1e8c5940c62f734e4b8a0b9c49eb8f9f2;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/meta-tizen-common-base/recipes-security/gumd/gumd.inc b/meta-tizen-common-base/recipes-security/gumd/gumd.inc
index 546d60a..7789e7b 100644 (file)
--- a/meta-tizen-common-base/recipes-security/gumd/gumd.inc
+++ b/meta-tizen-common-base/recipes-security/gumd/gumd.inc
@@ -100,7 +100,7 @@ do_install() {
  
  rm -rf ${D}
  
-   oe_runmake \
+   make \
          DESTDIR=${D} \
          INSTALL_ROOT=${D} \
          BINDIR=${prefix}/bin \

diff --git a/meta-tizen-common-base/recipes-security/libprivilege-control/libprivilege-control_git.bb b/meta-tizen-common-base/recipes-security/libprivilege-control/libprivilege-control_git.bb
index 73a611c..1721f3b 100644 (file)
--- a/meta-tizen-common-base/recipes-security/libprivilege-control/libprivilege-control_git.bb
+++ b/meta-tizen-common-base/recipes-security/libprivilege-control/libprivilege-control_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/core/security/libprivilege-control;tag=e613fc4d3632b7cc79187ade3186d1e07ec79170;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/security/libprivilege-control;tag=02e047c543cc35b40f0a59c81f65570cc557038e;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common_git.bb b/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common_git.bb
index 39851d1..eaeaf31 100644 (file)
--- a/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common_git.bb
+++ b/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common_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/profile/common/weston-common;tag=d32942db24a02debf5a4b026ba82609cef4fe3b6;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/common/weston-common;tag=15a44961f3d4285537c4c210176138b4e0368ba1;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

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 3ca9b1b..d8c6eff 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=e02d90f63d504e1126cdb98e24cd0bd168b0d4d9;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/framework/web/crosswalk;tag=4c34a63b5fd4244d48cf29490c20fe1aca799ef9;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk_git.bb b/meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk_git.bb
index 300507e..041e3bd 100644 (file)
--- a/meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-crosswalk_git.bb
+++ b/meta-tizen-common-share/recipes-crosswalk/tizen-extensions-crosswalk/tizen-extensions-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/tizen-extensions-crosswalk;tag=21ea2032c15d8c60e32c53716c536c3ec6572a4b;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/framework/web/tizen-extensions-crosswalk;tag=a79b3c4abb9c5b9a50b0a82d3b57b9c83788f8e7;nobranch=1"
 
 BBCLASSEXTEND += " native "