diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-05 15:59:24 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-05 18:00:00 +0100 |
| commit | ed6e039bf9b16ea882995780425b33b84f9356cf (patch) | |
| tree | 78dd6bd10c978cbf19b51077dfb9bf211f8b5615 | |
| parent | b9c7fdd4b204ab1c2466e9ec5d933bbc635fcc4f (diff) | |
| download | openembedded-core-ed6e039bf9b16ea882995780425b33b84f9356cf.tar.gz openembedded-core-ed6e039bf9b16ea882995780425b33b84f9356cf.tar.bz2 openembedded-core-ed6e039bf9b16ea882995780425b33b84f9356cf.zip | |
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 <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 4 |
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 () { 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* |