aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Gerasimov <anton.gerasimov@here.com>2018-08-31 18:56:21 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2018-10-12 10:02:38 +0000
commitc5eef2fde0f0dfcba05062247ebab9d3e6c34a10 (patch)
tree486a96d0b7d7ce69617334230b81c33fae03c323
parent7a6616c1384d91b349b833f2cb9ee1325e1a7ecb (diff)
Move security manager database under /var/local
It is critical for agl-sota feature Bug-AGL: SPEC-1717 Change-Id: Ia4060721e3a092d13934d3af575199e67e356e71 Signed-off-by: Anton Gerasimov <anton.gerasimov@here.com>
-rw-r--r--meta-app-framework/recipes-core/security-manager/security-manager/Removing-tizen-platform-config.patch4
-rw-r--r--meta-app-framework/recipes-core/security-manager/security-manager/init-security-manager-db.sh6
-rw-r--r--meta-security/recipes-security/security-manager/security-manager.inc2
3 files changed, 6 insertions, 6 deletions
diff --git a/meta-app-framework/recipes-core/security-manager/security-manager/Removing-tizen-platform-config.patch b/meta-app-framework/recipes-core/security-manager/security-manager/Removing-tizen-platform-config.patch
index 1c9edcfc2..bea3516d8 100644
--- a/meta-app-framework/recipes-core/security-manager/security-manager/Removing-tizen-platform-config.patch
+++ b/meta-app-framework/recipes-core/security-manager/security-manager/Removing-tizen-platform-config.patch
@@ -22,7 +22,7 @@ index 6f211c6..ed8047a 100755
POLICY_PATH=/usr/share/security-manager/policy
PRIVILEGE_GROUP_MAPPING=$POLICY_PATH/privilege-group.list
-DB_FILE=`tzplatform-get TZ_SYS_DB | cut -d= -f2`/.security-manager.db
-+DB_FILE=/var/db/security-manager/.security-manager.db
++DB_FILE=/var/local/db/security-manager/.security-manager.db
# Create default buckets
while read bucket default_policy
@@ -69,7 +69,7 @@ index 4d73d90..03c6680 100644
namespace SecurityManager {
-const char *const PRIVILEGE_DB_PATH = tzplatform_mkpath(TZ_SYS_DB, ".security-manager.db");
-+const char *const PRIVILEGE_DB_PATH = "/var/db/security-manager/.security-manager.db";
++const char *const PRIVILEGE_DB_PATH = "/var/local/db/security-manager/.security-manager.db";
enum class QueryType {
EGetPkgPrivileges,
diff --git a/meta-app-framework/recipes-core/security-manager/security-manager/init-security-manager-db.sh b/meta-app-framework/recipes-core/security-manager/security-manager/init-security-manager-db.sh
index ef41286c8..f90192a84 100644
--- a/meta-app-framework/recipes-core/security-manager/security-manager/init-security-manager-db.sh
+++ b/meta-app-framework/recipes-core/security-manager/security-manager/init-security-manager-db.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ ! -e "/var/db/security-manager" ]; then
- mkdir -p /var/db
- cp -ra /usr/dbspace/ /var/db/security-manager
+if [ ! -e "/var/local/db/security-manager" ]; then
+ mkdir -p /var/local/db
+ cp -ra /usr/dbspace/ /var/local/db/security-manager
fi
diff --git a/meta-security/recipes-security/security-manager/security-manager.inc b/meta-security/recipes-security/security-manager/security-manager.inc
index ee749a8fb..810106d75 100644
--- a/meta-security/recipes-security/security-manager/security-manager.inc
+++ b/meta-security/recipes-security/security-manager/security-manager.inc
@@ -22,7 +22,7 @@ systemd \
PACKAGECONFIG ??= ""
PACKAGECONFIG[debug] = "-DCMAKE_BUILD_TYPE=DEBUG,-DCMAKE_BUILD_TYPE=RELEASE"
-TZ_SYS_DB = "/var/db/security-manager"
+TZ_SYS_DB = "/var/local/db/security-manager"
EXTRA_OECMAKE = " \
-DCMAKE_VERBOSE_MAKEFILE=ON \