diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-04-24 15:20:30 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-09 11:51:59 +0100 |
commit | b4ba37ce13e8524bd931062edbf670ea1e14d26b (patch) | |
tree | 7a36b07487ca81fb351e12589fcd887f8bf8340a | |
parent | 4dfdb53c8ac5bfd525b45686279ac5891aabd872 (diff) | |
download | poky-b4ba37ce13e8524bd931062edbf670ea1e14d26b.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: e40f202d5f3228934c0e4b49218767864580d003)
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.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index e0522be729..3553376582 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -348,7 +348,7 @@ do_install_ptest () { | |||
348 | # These access the internet which is not guaranteed to work on machines running the tests | 348 | # These access the internet which is not guaranteed to work on machines running the tests |
349 | rm -rf ${D}${PTEST_PATH}/testsuite/wget | 349 | rm -rf ${D}${PTEST_PATH}/testsuite/wget |
350 | sort ${B}/.config > ${D}${PTEST_PATH}/.config | 350 | sort ${B}/.config > ${D}${PTEST_PATH}/.config |
351 | ln -s /bin/busybox ${D}${PTEST_PATH}/busybox | 351 | ln -s ${base_bindir}/busybox ${D}${PTEST_PATH}/busybox |
352 | } | 352 | } |
353 | 353 | ||
354 | inherit update-alternatives | 354 | inherit update-alternatives |