busybox: Change symlink locations to match alternative

Change the symlink locations of start-stop-daemon and base32 to from
BASE_S?BINDIR to S?BINDIR, to match dpkg and coreutils, respectively.

Related to bug #14804 [1].

[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=14804

Signed-off-by: Alexander van Gessel <ai0867@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index cebfd3c48cab815b3b4cf9f53038ebb2a9aa79b2..638b40c758fcdf6d67bc1f4e830230487b5e0611 100644 (file)
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -222,10 +222,14 @@ do_install () {
        sed -i "s:^/usr/bin/:BINDIR/:" busybox.links*
        sed -i "s:^/usr/sbin/:SBINDIR/:" busybox.links*
 
-       # Move arch/link to BINDIR to match coreutils
+       # Move arch/base32/link to BINDIR to match coreutils
        sed -i "s:^BASE_BINDIR/arch:BINDIR/arch:" busybox.links*
+       sed -i "s:^BASE_BINDIR/base32:BINDIR/base32:" busybox.links*
        sed -i "s:^BASE_BINDIR/link:BINDIR/link:" busybox.links*
 
+       # Move start-stop-daemon to SBINDIR to match dpkg
+       sed -i "s:^BASE_SBINDIR/start-stop-daemon:SBINDIR/start-stop-daemon:" busybox.links*
+
        sed -i "s:^BASE_BINDIR/:${base_bindir}/:" busybox.links*
        sed -i "s:^BASE_SBINDIR/:${base_sbindir}/:" busybox.links*
        sed -i "s:^BINDIR/:${bindir}/:" busybox.links*