busybox: Sync arch and link locations with coreutils

coreutils installs these into bindir, folllow its lead to avoid postinst
failures when installing coreutils and busybox together.

(From OE-Core rev: ed6e039bf9b16ea882995780425b33b84f9356cf)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 586d5342e60ceda14af4f23160328d678d105576..77aa54137659b5f8cda11525b78d4f1387d01ef9 100644 (file)
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -208,6 +208,10 @@ 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
+       sed -i "s:^BASE_BINDIR/arch:BINDIR/arch:" busybox.links*
+       sed -i "s:^BASE_BINDIR/link:BINDIR/link:" 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*