From: Richard Purdie Date: Wed, 5 Sep 2018 14:59:24 +0000 (+0100) Subject: busybox: Sync arch and link locations with coreutils X-Git-Tag: uninative-2.3~441 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ed6e039bf9b16ea882995780425b33b84f9356cf;p=openembedded-core.git 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. Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 586d5342e6..77aa541376 100644 --- 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*