summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-05 15:59:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-05 18:00:25 +0100
commit9fb645f0dfeb4d1863a2162d331b04eabad6f570 (patch)
treeb41a0a94177d69affa7293e994cfebf94797ef21 /meta/recipes-core
parent29108755c1c5a23855ab4dda59ea728781b9d75e (diff)
downloadpoky-9fb645f0dfeb4d1863a2162d331b04eabad6f570.tar.gz
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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/busybox/busybox.inc4
1 files changed, 4 insertions, 0 deletions
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 () {
208 sed -i "s:^/usr/bin/:BINDIR/:" busybox.links* 208 sed -i "s:^/usr/bin/:BINDIR/:" busybox.links*
209 sed -i "s:^/usr/sbin/:SBINDIR/:" busybox.links* 209 sed -i "s:^/usr/sbin/:SBINDIR/:" busybox.links*
210 210
211 # Move arch/link to BINDIR to match coreutils
212 sed -i "s:^BASE_BINDIR/arch:BINDIR/arch:" busybox.links*
213 sed -i "s:^BASE_BINDIR/link:BINDIR/link:" busybox.links*
214
211 sed -i "s:^BASE_BINDIR/:${base_bindir}/:" busybox.links* 215 sed -i "s:^BASE_BINDIR/:${base_bindir}/:" busybox.links*
212 sed -i "s:^BASE_SBINDIR/:${base_sbindir}/:" busybox.links* 216 sed -i "s:^BASE_SBINDIR/:${base_sbindir}/:" busybox.links*
213 sed -i "s:^BINDIR/:${bindir}/:" busybox.links* 217 sed -i "s:^BINDIR/:${bindir}/:" busybox.links*