summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-08-13 22:19:18 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-14 17:33:49 +0100
commit8af44421749727f755185303ebec8d2cc3b9b9aa (patch)
treeadf49d25a9f64c0c57e01604b027a74b4a3b8d4d
parentc47b8300be4332fbcaae44a8ab76b88633e45ea0 (diff)
downloadpoky-8af44421749727f755185303ebec8d2cc3b9b9aa.tar.gz
musl: Delete GLIBC_LDSO before creating symlink with lnr
Fixes rebuild failures after say do_compile fails | ./tools/install.sh -D -r /mnt/a/yoe/build/tmp/work/riscv64-yoe-linux-musl/musl/1.1.23+gitAUTOINC+d0b547dfb5-r0/image/usr/lib/libc.so /mnt/a/yoe/build/tmp/work/riscv64-yoe-linux-musl/musl/1.1.23+gitAUTOINC+d0b547dfb5-r0/image/lib/ld-musl-riscv64.so.1 || true | Traceback (most recent call last): | File "/mnt/a/yoe/sources/openembedded-core/scripts/lnr", line 24, in <module> | os.symlink(target, linkname) | FileExistsError: [Errno 17] File exists: 'image/usr/lib/libc.so' -> '/mnt/a/yoe/build/tmp/work/riscv64-yoe-linux-musl/musl/1.1.23+gitAUTOINC+d0b547dfb5-r0/imageNone' (From OE-Core rev: 78a75d240083a80d624074e058c9a222a8a7b5e7) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/musl/musl_git.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index c3786c4eb3..6425b5cd36 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -63,7 +63,7 @@ do_install() {
63 oe_runmake install DESTDIR='${D}' 63 oe_runmake install DESTDIR='${D}'
64 64
65 install -d ${D}${bindir} 65 install -d ${D}${bindir}
66 rm -f ${D}${bindir}/ldd 66 rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO}
67 lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd 67 lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd
68 lnr ${D}${libdir}/libc.so ${D}${GLIBC_LDSO} 68 lnr ${D}${libdir}/libc.so ${D}${GLIBC_LDSO}
69 for l in crypt dl m pthread resolv rt util xnet 69 for l in crypt dl m pthread resolv rt util xnet