diff options
| author | Philippe Coval <philippe.coval@osg.samsung.com> | 2016-01-20 10:33:26 +0100 |
|---|---|---|
| committer | Leon Anavi <leon.anavi@konsulko.com> | 2016-01-27 08:26:57 +0000 |
| commit | 0c3d7fb8bc5dc6888b35dc84a5ecba2e978cbf94 (patch) | |
| tree | 67226675318a8307047544287f3d4f71b9ed34b3 /meta-tizen | |
| parent | 01c528b5102add4673cacceba15ed41fbd82f92a (diff) | |
| download | tizen-distro-0c3d7fb8bc5dc6888b35dc84a5ecba2e978cbf94.tar.gz tizen-distro-0c3d7fb8bc5dc6888b35dc84a5ecba2e978cbf94.tar.bz2 tizen-distro-0c3d7fb8bc5dc6888b35dc84a5ecba2e978cbf94.zip | |
meta-tizen: murphy: Prevent running ldconfig if not on system
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: I2ae3467c0f0e8b5b620d1772774771e3c33774ae
(From meta-tizen rev: 759339cc168638291a5e1ab3f82b6b403786907d)
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Diffstat (limited to 'meta-tizen')
| -rw-r--r-- | meta-tizen/meta-tizen-common-share/recipes-core/murphy/murphy.inc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/meta-tizen/meta-tizen-common-share/recipes-core/murphy/murphy.inc b/meta-tizen/meta-tizen-common-share/recipes-core/murphy/murphy.inc index f37a1d9116..82e7d044f7 100644 --- a/meta-tizen/meta-tizen-common-share/recipes-core/murphy/murphy.inc +++ b/meta-tizen/meta-tizen-common-share/recipes-core/murphy/murphy.inc @@ -300,7 +300,7 @@ do_install() { pkg_postinst_${PN}() { #!/bin/sh -e - ldconfig + [ "" != "$D" ] || ldconfig } @@ -309,49 +309,49 @@ pkg_postinst_${PN}() { /bin/systemctl --user enable --global murphyd.service setcap 'cap_net_admin=+ep' $D${prefix}/bin/murphyd - ldconfig + [ "" != "$D" ] || ldconfig } pkg_postinst_${PN}() { #!/bin/sh -e - ldconfig + [ "" != "$D" ] || ldconfig } pkg_postinst_${PN}() { #!/bin/sh -e - ldconfig + [ "" != "$D" ] || ldconfig } pkg_postinst_${PN}() { #!/bin/sh -e - ldconfig + [ "" != "$D" ] || ldconfig } pkg_postinst_${PN}() { #!/bin/sh -e - ldconfig + [ "" != "$D" ] || ldconfig } pkg_postinst_${PN}() { #!/bin/sh -e - ldconfig + [ "" != "$D" ] || ldconfig } pkg_postrm_${PN}() { #!/bin/sh -e - ldconfig + [ "" != "$D" ] || ldconfig } @@ -361,42 +361,42 @@ pkg_postrm_${PN}() { if [ "$1" = "0" ]; then systemctl --user disable --global murphyd.service fi - ldconfig + [ "" != "$D" ] || ldconfig } pkg_postrm_${PN}() { #!/bin/sh -e - ldconfig + [ "" != "$D" ] || ldconfig } pkg_postrm_${PN}() { #!/bin/sh -e - ldconfig + [ "" != "$D" ] || ldconfig } pkg_postrm_${PN}() { #!/bin/sh -e - ldconfig + [ "" != "$D" ] || ldconfig } pkg_postrm_${PN}() { #!/bin/sh -e - ldconfig + [ "" != "$D" ] || ldconfig } pkg_postrm_${PN}() { #!/bin/sh -e - ldconfig + [ "" != "$D" ] || ldconfig } |