]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
busybox: Use base_bindir instead of hardcoding /bin path
authorKhem Raj <raj.khem@gmail.com>
Sun, 24 Apr 2022 22:20:30 +0000 (15:20 -0700)
committerAnuj Mittal <anuj.mittal@intel.com>
Tue, 10 May 2022 03:44:26 +0000 (11:44 +0800)
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>
meta/recipes-core/busybox/busybox.inc

index 808c3dc700952c3bcbcd8d38077770d71aa33626..187ca15957fe6b74114a5b44a52c4e43ab96e31d 100644 (file)
@@ -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