[oe-commits] [meta-openembedded] 07/21: start-stop-daemon: Only create a link in ${base_sbindir} if necessary

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 2d8bbac9792e3c1d7a23f31f217dfc02767321df
Author: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
AuthorDate: Wed Aug 16 15:06:10 2017 +0200

    start-stop-daemon: Only create a link in ${base_sbindir} if necessary
    
    If usrmerge is enabled in DISTRO_FEATURES, then ${base_sbindir} and
    ${sbindir} are set to the same path and the symbolic link from
    ${base_sbindir}/start-stop-daemon to ${sbindir}/start-stop-daemon can
    (and should) not be created.
    
    Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 .../recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb
index 5ee4472..cc2727b 100644
--- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb
+++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb
@@ -31,6 +31,8 @@ do_install_append () {
 
     # support for buggy init.d scripts that refer to an alternative
     # explicit path to start-stop-daemon
-    mkdir -p ${D}/sbin/
-    ln -sf /usr/sbin/start-stop-daemon ${D}/sbin/start-stop-daemon
+    if [ "${base_sbindir}" != "${sbindir}" ]; then
+        mkdir -p ${D}${base_sbindir}
+        ln -sf ${sbindir}/start-stop-daemon ${D}${base_sbindir}/start-stop-daemon
+    fi
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.