diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-04-24 15:20:30 -0700 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-04-29 05:27:54 -1000 |
| commit | 592464cb64a8eedf2ee1537934ba714059c2e0ce (patch) | |
| tree | 64329676342825f79a7c92a47b618de574c03224 /meta/recipes-core/busybox | |
| parent | 05caadbfb940e236dcdc41620cf20de5809e8f40 (diff) | |
| download | openembedded-core-contrib-592464cb64a8eedf2ee1537934ba714059c2e0ce.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: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-core/busybox')
| -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 69fa499737..5f1c473d5e 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -347,7 +347,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 |