From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 8/8] busybox: Sync arch and link locations with coreutils
Date: Wed, 5 Sep 2018 17:52:27 +0100 [thread overview]
Message-ID: <20180905165227.29435-8-richard.purdie@linuxfoundation.org> (raw)
In-Reply-To: <20180905165227.29435-1-richard.purdie@linuxfoundation.org>
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>
---
meta/recipes-core/busybox/busybox.inc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index c26ef56bf78..c02e0623e37 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*
--
2.17.1
next prev parent reply other threads:[~2018-09-05 16:52 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-05 16:52 [PATCH 1/8] python: Run pybench once for optimisation task in pgo Richard Purdie
2018-09-05 16:52 ` [PATCH 2/8] os-release: fix to install in the expected location Richard Purdie
2018-09-05 17:16 ` Andre McCurdy
2018-09-05 17:20 ` richard.purdie
2018-09-05 16:52 ` [PATCH 3/8] gcc: Merge two related patches together Richard Purdie
2018-09-05 16:52 ` [PATCH 4/8] binutils: Fix variable conflict Richard Purdie
2018-09-05 20:52 ` Khem Raj
2018-09-05 16:52 ` [PATCH 5/8] populate_base_sdk: Stop running gcc --version all the time Richard Purdie
2018-09-05 16:52 ` [PATCH 6/8] maintainers: Add entry for fribidi Richard Purdie
2018-09-05 16:52 ` [PATCH 7/8] busybox: Put klogd/syslogd alternative links in syslog package Richard Purdie
2018-09-06 2:11 ` ChenQi
2018-09-06 8:19 ` richard.purdie
2018-09-06 9:04 ` ChenQi
2018-09-06 22:05 ` richard.purdie
2018-09-06 22:51 ` Richard Purdie
2018-09-07 14:07 ` Mark Hatle
2018-09-05 16:52 ` Richard Purdie [this message]
2018-09-06 8:15 ` [PATCH 1/8] python: Run pybench once for optimisation task in pgo Robert Yang
2018-09-06 8:17 ` richard.purdie
2018-09-06 8:22 ` Robert Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180905165227.29435-8-richard.purdie@linuxfoundation.org \
--to=richard.purdie@linuxfoundation.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox