diff options
author | Philippe Coval <philippe.coval@osg.samsung.com> | 2016-01-20 10:33:25 +0100 |
---|---|---|
committer | Philippe Coval <philippe.coval@osg.samsung.com> | 2016-01-20 10:40:43 +0100 |
commit | 4488b2e666ba6757db57af09bfd981c93d6446f8 (patch) | |
tree | 3f73fe35eef07b70e8505786d52c92fdf42c5a80 | |
parent | 4a9ae2d0394a94ad7ecbd927aae40b125ee5baf7 (diff) | |
download | meta-tizen-4488b2e666ba6757db57af09bfd981c93d6446f8.tar.gz meta-tizen-4488b2e666ba6757db57af09bfd981c93d6446f8.tar.bz2 meta-tizen-4488b2e666ba6757db57af09bfd981c93d6446f8.zip |
security-server: Prevent running ldconfig or systemctl if...
This should be executed on system and not on build host.
Note It might worth to rewrite all recipes that involve systemd
and inherit systemd class when possible (check how for user sessions).
Without this change,
bitbake tries to run ldconfig on host instead
and then complains (but not fail !) about permission issue like :
/sbin/ldconfig.real: \
Can't create temporary cache file /etc/ld.so.cache~: \
Permission denied
Note, "or condition" is prefered because of shell's -e option.
Change-Id: Ib519697d4df1b9754e34ba030eb5b4ebf8c3ad92
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
-rw-r--r-- | meta-tizen-common-base/recipes-security/security-server/security-server.inc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/meta-tizen-common-base/recipes-security/security-server/security-server.inc b/meta-tizen-common-base/recipes-security/security-server/security-server.inc index b3fbc39f..90daf21b 100644 --- a/meta-tizen-common-base/recipes-security/security-server/security-server.inc +++ b/meta-tizen-common-base/recipes-security/security-server/security-server.inc @@ -157,14 +157,17 @@ do_install() { pkg_postinst_${PN}() { #!/bin/sh -e - ldconfig - systemctl daemon-reload - if [ $1 = 1 ]; then + [ "" != "$D" ] || ldconfig + # installation + if [ $1 = 1 ]; then + systemctl daemon-reload systemctl start security-server.service fi - if [ $1 = 2 ]; then + # update + if [ $1 = 2 ]; then + systemctl daemon-reload systemctl restart security-server.service fi @@ -195,7 +198,7 @@ pkg_postrm_libsecurity-server-client() { pkg_postrm_${PN}() { #!/bin/sh -e - ldconfig + [ "" != "$D" ] || ldconfig if [ $1 = 0 ]; then # unistall systemctl daemon-reload |