[oe] [meta-oe][PATCH] start-stop-daemon: Only create a link in ${base_sbindir} if necessary

[Peter Kjellerstedt]

Bah, I have been on vacation for too long. v2 coming up…

//Peter

From: Martin Jansa [mailto:martin.jansa at gmail.com]
Sent: den 16 augusti 2017 14:53
To: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
Cc: openembedded-devel <openembedded-devel at lists.openembedded.org>
Subject: Re: [oe] [meta-oe][PATCH] start-stop-daemon: Only create a link in ${base_sbindir} if necessary

Missing SOB line.

On Wed, Aug 16, 2017 at 1:23 PM, Peter Kjellerstedt <peter.kjellerstedt at axis.com<mailto:peter.kjellerstedt at axis.com>> wrote:
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.
---
 .../recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb<http://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<http://start-stop-daemon_1.17.25.bb> b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb<http://start-stop-daemon_1.17.25.bb>
index 5ee4472cd..cc2727b75 100644
--- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb<http://start-stop-daemon_1.17.25.bb>
+++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb<http://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
 }
--
2.12.0

--
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel at lists.openembedded.org<mailto:Openembedded-devel at lists.openembedded.org>
http://lists.openembedded.org/mailman/listinfo/openembedded-devel