summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-04-24 15:20:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-04 13:07:33 +0100
commit47f2e758372dedae78e315c9c332c706d784c801 (patch)
treeacf7f7ebce9acbab6112d8a57c73bb47b689038d
parent4c098bd8ae4291929a751fadf85e20f19976173a (diff)
downloadpoky-47f2e758372dedae78e315c9c332c706d784c801.tar.gz
busybox: Use base_bindir instead of hardcoding /bin path
This symlink is not valid when using usrmerge and ptest packaging would fail Exception: FileExistsError: [Errno 17] File exists: '/usr/bin/busybox.suid' -> '/mnt/b/yoe/master/build/tmp/work/ppc64p9le-yoe-linux-musl/busybox/1.35.0-r0/package/usr/lib/busybox/ptest/bin/login' (From OE-Core rev: 592464cb64a8eedf2ee1537934ba714059c2e0ce) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 238fd30689054c7b44176dce7180fb6dac4e1b6f) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/busybox/busybox.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 69fa499737..5f1c473d5e 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -347,7 +347,7 @@ do_install_ptest () {
347 # These access the internet which is not guaranteed to work on machines running the tests 347 # These access the internet which is not guaranteed to work on machines running the tests
348 rm -rf ${D}${PTEST_PATH}/testsuite/wget 348 rm -rf ${D}${PTEST_PATH}/testsuite/wget
349 sort ${B}/.config > ${D}${PTEST_PATH}/.config 349 sort ${B}/.config > ${D}${PTEST_PATH}/.config
350 ln -s /bin/busybox ${D}${PTEST_PATH}/busybox 350 ln -s ${base_bindir}/busybox ${D}${PTEST_PATH}/busybox
351} 351}
352 352
353inherit update-alternatives 353inherit update-alternatives