Change-Id: If70c5c84e133fb2ba96c557136b04cb86b8bb1f7
Signed-off-by: Jean-Benoit MARTIN <jean-benoit.martin@open.eurogiciel.org>
13 files changed:
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
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 "
BBCLASSEXTEND += " native "
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
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 "
BBCLASSEXTEND += " native "
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
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 "
BBCLASSEXTEND += " native "
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
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 "
BBCLASSEXTEND += " native "
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
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 "
BBCLASSEXTEND += " native "
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
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 "
BBCLASSEXTEND += " native "
HOMEPAGE = "http://nohomepage.org"
SECTION = "Security/Application Privilege"
LICENSE = "Apache-2.0"
HOMEPAGE = "http://nohomepage.org"
SECTION = "Security/Application Privilege"
LICENSE = "Apache-2.0"
BBCLASSEXTEND = ""
PROVIDES = ""
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"
#PROVIDES by libcynara-creds-socket
PROVIDES += "libcynara-creds-socket"
DEPENDS += "gmock"
DEPENDS += "gtest"
DEPENDS += "gmock"
DEPENDS += "gtest"
+CFLAGS_prepend = "-I ${S}/include "
+
+
do_prep() {
cd ${S}
chmod -Rf a+rX,u+w,g-w,o-w ${S}
do_prep() {
cd ${S}
chmod -Rf a+rX,u+w,g-w,o-w ${S}
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/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 .
export CXXFLAGS="$CXXFLAGS -DCYNARA_STATE_PATH=\\\"${localstatedir}/cynara/\\\" \
-DCYNARA_LIB_PATH=\\\"${prefix}/lib/cynara/\\\" \
-DCYNARA_TESTS_DIR=\\\"${prefix}/share/cynara/tests/\\\" \
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 "
export LDFLAGS="${LDFLAGS} -Wl,--rpath=${prefix}/lib "
${EXTRA_OECMAKE} . \
-DBUILD_TESTS=OFF \
-DCMAKE_BUILD_TYPE=RELEASE \
${EXTRA_OECMAKE} . \
-DBUILD_TESTS=OFF \
-DCMAKE_BUILD_TYPE=RELEASE \
- -DCMAKE_VERBOSE_MAKEFILE=ON
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DDB_FILES_SMACK_LABEL="System"
fi
if [ $1 -gt 1 ] ; then
OLDVERSION="$(rpm -q --qf '%{version}' cynara)"
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}
- $D${prefix}/sbin/cynara/cynara-db-migration.sh install -t 0.5.0
+ $D${prefix}/sbin/cynara/cynara-db-migration.sh install -t ${PV}
#!/bin/sh -e
if [ $1 = 0 ]; then
#!/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
userdel -r cynara > /dev/null 2>&1
groupdel cynara > /dev/null 2>&1
systemctl daemon-reload
cynara-tests_files = ""
cynara-tests_files += "/usr/bin/cynara-tests"
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"
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"
cynara-db-migration_files = ""
cynara-db-migration_files += "${prefix}/sbin/cynara/cynara-db-migration.sh"
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 = ""
MANIFESTFILES_${PN}-db-migration = "cynara-db-migration.manifest"
cynara-dev_files = ""
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
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 "
BBCLASSEXTEND += " native "
DESTDIR=${D} \
INSTALL_ROOT=${D} \
BINDIR=${prefix}/bin \
DESTDIR=${D} \
INSTALL_ROOT=${D} \
BINDIR=${prefix}/bin \
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
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 "
BBCLASSEXTEND += " native "
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
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 "
BBCLASSEXTEND += " native "
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
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 "
BBCLASSEXTEND += " native "
LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
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 "
BBCLASSEXTEND += " native "