aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuta Doi <yuta-d@witz-inc.co.jp>2016-12-07 17:42:51 +0900
committerYuta Doi <yuta-d@witz-inc.co.jp>2016-12-07 17:42:51 +0900
commitb0bc7f45aa4a70d2b8b9e0e9c0eaef942ebf4acc (patch)
treec0b703e17dac7b0552ee17946b54fd4a7f9658fb
parent93e4e40edacf30a87c31459d2415965a0b888822 (diff)
Update privacy-manager-server
from: 866b0492038f7515b22f415f40c6edfa02e8cb84 to : 3546eb6bf0d4102532c61cab1a5825a77862ed56 Change-Id: I443ce7011742075d3f72f8dd310649e541d7f80f Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
-rw-r--r--meta-application-manager/recipes-others/privacy-manager-server/privacy-manager-server.inc15
-rw-r--r--meta-application-manager/recipes-others/privacy-manager-server/privacy-manager-server_git.bb2
2 files changed, 9 insertions, 8 deletions
diff --git a/meta-application-manager/recipes-others/privacy-manager-server/privacy-manager-server.inc b/meta-application-manager/recipes-others/privacy-manager-server/privacy-manager-server.inc
index bb43774..f7a27da 100644
--- a/meta-application-manager/recipes-others/privacy-manager-server/privacy-manager-server.inc
+++ b/meta-application-manager/recipes-others/privacy-manager-server/privacy-manager-server.inc
@@ -124,7 +124,7 @@ do_compile() {
-DVERSION=0.0.4 \
-DFILTER_LISTED_PKG=ON \
-DPRIVACY_POPUP=OFF
- oe_runmake ${PARALLEL_MAKE}
+ make ${PARALLEL_MAKE}
@@ -156,7 +156,7 @@ do_install() {
find ${D} -regex ".*\.la$" | xargs rm -f --
find ${D} -regex ".*\.a$" | xargs rm -f --
- #mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
+ #mkdir -p ${D}${prefix}/lib/systemd/system/multi-user.target.wants
#install -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/privacy-manager-server.service
#ln -sf /usr/lib/systemd/system/privacy-manager-server.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/privacy-manager-server.service
@@ -173,15 +173,16 @@ pkg_postinst_privacy-manager-client() {
pkg_postinst_privacy-manager-server() {
#!/bin/sh -e
- ldconfig
+ [ "x$D" == "x" ] && ldconfig
+
echo "Check privacy DB"
if [ ! -f $D${prefix}/dbspace/.privacy.db ]
then
echo "Create privacy DB"
- privacy_manager_create_clean_db.sh
+ ${prefix}/bin/privacy_manager_create_clean_db.sh
fi
- chsmack -a 'User' $D${prefix}/dbspace/.privacy.db*
- chsmack -a 'User' $D${prefix}/dbspace/.privacylist.db*
+ chsmack -a 'System::Shared' $D${prefix}/dbspace/.privacy.db*
+ chsmack -a 'System::Shared' $D${prefix}/dbspace/.privacylist.db*
}
@@ -226,7 +227,7 @@ MANIFESTFILES_privacy-manager-client = "privacy-manager-client.manifest"
privacy-manager-server_files = ""
privacy-manager-server_files += "${prefix}/lib/libprivacy-manager-server.so*"
privacy-manager-server_files += "${prefix}/dbspace/.privacylist.db"
-privacy-manager-server_files += "${prefix}/bin/*"
+privacy-manager-server_files += "/usr/bin/*"
MANIFESTFILES_${PN} = "privacy-manager-server.manifest"
privacy-manager-server-dev_files = ""
diff --git a/meta-application-manager/recipes-others/privacy-manager-server/privacy-manager-server_git.bb b/meta-application-manager/recipes-others/privacy-manager-server/privacy-manager-server_git.bb
index c975ba9..d43c269 100644
--- a/meta-application-manager/recipes-others/privacy-manager-server/privacy-manager-server_git.bb
+++ b/meta-application-manager/recipes-others/privacy-manager-server/privacy-manager-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/security/privacy-manager;tag=866b0492038f7515b22f415f40c6edfa02e8cb84;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/security/privacy-manager;tag=3546eb6bf0d4102532c61cab1a5825a77862ed56;nobranch=1"
BBCLASSEXTEND += " native "