diff options
| author | Alexander van Gessel <ai@ai0867.net> | 2025-01-29 12:31:54 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-02-01 13:20:45 +0000 |
| commit | 0a3a771c237e6d78ff4ef46558a4e30c02aec358 (patch) | |
| tree | aaaff5dfc36ef5a08c2258412f1cd6f377347c30 | |
| parent | f78cd863d913f2cfee71123ed1898ab5fda1ea76 (diff) | |
| download | poky-0a3a771c237e6d78ff4ef46558a4e30c02aec358.tar.gz | |
busybox: Change symlink locations to match alternative
Change the symlink locations of start-stop-daemon and base32 to from
BASE_S?BINDIR to S?BINDIR, to match dpkg and coreutils, respectively.
Related to bug #14804 [1].
[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=14804
(From OE-Core rev: 9998d91f982cd323fa5da20edda8b1828bd4fb5d)
Signed-off-by: Alexander van Gessel <ai0867@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index cebfd3c48c..638b40c758 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
| @@ -222,10 +222,14 @@ do_install () { | |||
| 222 | sed -i "s:^/usr/bin/:BINDIR/:" busybox.links* | 222 | sed -i "s:^/usr/bin/:BINDIR/:" busybox.links* |
| 223 | sed -i "s:^/usr/sbin/:SBINDIR/:" busybox.links* | 223 | sed -i "s:^/usr/sbin/:SBINDIR/:" busybox.links* |
| 224 | 224 | ||
| 225 | # Move arch/link to BINDIR to match coreutils | 225 | # Move arch/base32/link to BINDIR to match coreutils |
| 226 | sed -i "s:^BASE_BINDIR/arch:BINDIR/arch:" busybox.links* | 226 | sed -i "s:^BASE_BINDIR/arch:BINDIR/arch:" busybox.links* |
| 227 | sed -i "s:^BASE_BINDIR/base32:BINDIR/base32:" busybox.links* | ||
| 227 | sed -i "s:^BASE_BINDIR/link:BINDIR/link:" busybox.links* | 228 | sed -i "s:^BASE_BINDIR/link:BINDIR/link:" busybox.links* |
| 228 | 229 | ||
| 230 | # Move start-stop-daemon to SBINDIR to match dpkg | ||
| 231 | sed -i "s:^BASE_SBINDIR/start-stop-daemon:SBINDIR/start-stop-daemon:" busybox.links* | ||
| 232 | |||
| 229 | sed -i "s:^BASE_BINDIR/:${base_bindir}/:" busybox.links* | 233 | sed -i "s:^BASE_BINDIR/:${base_bindir}/:" busybox.links* |
| 230 | sed -i "s:^BASE_SBINDIR/:${base_sbindir}/:" busybox.links* | 234 | sed -i "s:^BASE_SBINDIR/:${base_sbindir}/:" busybox.links* |
| 231 | sed -i "s:^BINDIR/:${bindir}/:" busybox.links* | 235 | sed -i "s:^BINDIR/:${bindir}/:" busybox.links* |
