From: Alexander van Gessel Date: Wed, 29 Jan 2025 11:31:54 +0000 (+0100) Subject: busybox: Change symlink locations to match alternative X-Git-Tag: yocto-5.2~666 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9998d91f982cd323fa5da20edda8b1828bd4fb5d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Alexander van Gessel Signed-off-by: Mathieu Dubois-Briand --- diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index cebfd3c48ca..638b40c758f 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -222,10 +222,14 @@ 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 + # Move arch/base32/link to BINDIR to match coreutils sed -i "s:^BASE_BINDIR/arch:BINDIR/arch:" busybox.links* + sed -i "s:^BASE_BINDIR/base32:BINDIR/base32:" busybox.links* sed -i "s:^BASE_BINDIR/link:BINDIR/link:" busybox.links* + # Move start-stop-daemon to SBINDIR to match dpkg + sed -i "s:^BASE_SBINDIR/start-stop-daemon:SBINDIR/start-stop-daemon:" 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*