Fix post install section for cynara package

[scm/bb/meta-tizen.git] / meta-tizen-common-base / recipes-security / cynara / cynara.inc

diff --git a/meta-tizen-common-base/recipes-security/cynara/cynara.inc b/meta-tizen-common-base/recipes-security/cynara/cynara.inc
index e286b72..d507b06 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"
 
@@ -106,7 +109,11 @@ inherit tizen_cmake
 DEPENDS += "zip"
 DEPENDS += "dbus"
 inherit pkgconfig
-DEPENDS += "pkgconfig(gmock)"
+DEPENDS += "gmock"
+DEPENDS += "gtest"
+
+CFLAGS_prepend = "-I ${S}/include "
+
 
 do_prep() {
  cd ${S}
@@ -124,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* .
  
  
@@ -147,8 +155,11 @@ 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/\\\""
- export LDFLAGS+="-Wl,--rpath=${prefix}/lib"
+                            -DCYNARA_CONFIGURATION_DIR=\\\"${sysconfdir}/cynara/\\\" \
+                            -DCYNARA_VERSION=\\\"${PV}\\\""
+
+
+ export LDFLAGS="${LDFLAGS} -Wl,--rpath=${prefix}/lib "
  
  
    cmake \
@@ -163,10 +174,12 @@ do_compile() {
          -DBUILD_SHARED_LIBS:BOOL=ON \
          -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
          ${EXTRA_OECMAKE} . \
-         -DBUILD_TESTS=ON \
+         -DBUILD_TESTS=OFF \
          -DCMAKE_BUILD_TYPE=RELEASE \
-         -DCMAKE_VERBOSE_MAKEFILE=ON
- make -j16
+         -DCMAKE_VERBOSE_MAKEFILE=ON \
+         -DDB_FILES_SMACK_LABEL="System"
+         
+oe_runmake
  
  
  
@@ -222,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 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 install -t ${PV}
     fi
 
 }
@@ -242,7 +255,7 @@ pkg_postinst_${PN}() {
     ### setcap/getcap binary are useful. To use them you must install libcap and libcap-tools packages
     ### In such case uncomment Requires with those packages
     systemctl daemon-reload
-    if [ $1 = 1 ]; then
+    if [ $1 == 1 ]; then
         systemctl enable cynara.service
     fi
     chsmack -a System ${localstatedir}/cynara/
@@ -329,8 +342,8 @@ pkg_postrm_libcynara-admin() {
 pkg_postrm_${PN}() {
     #!/bin/sh -e
 
-    if [ $1 = 0 ]; then
-        $D${prefix}/sbin/cynara/cynara-db-migration.sh uninstall -f 0.5.0
+    if [ $1 == 0 ]; then
+        $D${prefix}/sbin/cynara/cynara-db-migration uninstall -f ${PV}
         userdel -r cynara > /dev/null 2>&1
         groupdel cynara > /dev/null 2>&1
         systemctl daemon-reload
@@ -379,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"
@@ -399,7 +413,8 @@ libcynara-creds-dbus_files += "${prefix}/lib/libcynara-creds-dbus.so.*"
 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-db-migration"
+cynara-db-migration_files += "${prefix}/sbin/cynara-db-chsgen"
 MANIFESTFILES_${PN}-db-migration = "cynara-db-migration.manifest"
 
 cynara-dev_files = ""