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-12 16:42:12 +0100 |
commit | d6d549a0e4c934ce646c8a6a492d308ceffb04df (patch) | |
tree | 04a8878cd10fbdc36f916e0c5638fa2139d6ac95 | |
parent | 780eeec8851950ee6ac07a2a398ba937206bd2e4 (diff) | |
download | poky-d6d549a0e4c934ce646c8a6a492d308ceffb04df.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: aedd917364beedb806e1d4d1d02c28d2597e473c)
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: Anuj Mittal <anuj.mittal@intel.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 808c3dc700..187ca15957 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -349,7 +349,7 @@ do_install_ptest () { | |||
349 | # These access the internet which is not guaranteed to work on machines running the tests | 349 | # These access the internet which is not guaranteed to work on machines running the tests |
350 | rm -rf ${D}${PTEST_PATH}/testsuite/wget | 350 | rm -rf ${D}${PTEST_PATH}/testsuite/wget |
351 | sort ${B}/.config > ${D}${PTEST_PATH}/.config | 351 | sort ${B}/.config > ${D}${PTEST_PATH}/.config |
352 | ln -s /bin/busybox ${D}${PTEST_PATH}/busybox | 352 | ln -s ${base_bindir}/busybox ${D}${PTEST_PATH}/busybox |
353 | } | 353 | } |
354 | 354 | ||
355 | inherit update-alternatives | 355 | inherit update-alternatives |