diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-04-24 15:20:30 -0700 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2022-05-10 11:44:26 +0800 |
commit | aedd917364beedb806e1d4d1d02c28d2597e473c (patch) | |
tree | 9709028eda913d5d0e4c0e945bc2b304fbf70fd3 | |
parent | 1a6f5e27249afb6fb4d47c523b62b5dd2482a69d (diff) | |
download | openembedded-core-contrib-aedd917364beedb806e1d4d1d02c28d2597e473c.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'
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>
-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 () { # These access the internet which is not guaranteed to work on machines running the tests rm -rf ${D}${PTEST_PATH}/testsuite/wget sort ${B}/.config > ${D}${PTEST_PATH}/.config - ln -s /bin/busybox ${D}${PTEST_PATH}/busybox + ln -s ${base_bindir}/busybox ${D}${PTEST_PATH}/busybox } inherit update-alternatives |