From: Khem Raj Date: Wed, 14 Aug 2019 05:19:18 +0000 (-0700) Subject: musl: Delete GLIBC_LDSO before creating symlink with lnr X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~13597 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78a75d240083a80d624074e058c9a222a8a7b5e7;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 | 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' Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index c3786c4eb33..6425b5cd362 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -63,7 +63,7 @@ do_install() { oe_runmake install DESTDIR='${D}' install -d ${D}${bindir} - rm -f ${D}${bindir}/ldd + rm -f ${D}${bindir}/ldd ${D}${GLIBC_LDSO} lnr ${D}${libdir}/libc.so ${D}${bindir}/ldd lnr ${D}${libdir}/libc.so ${D}${GLIBC_LDSO} for l in crypt dl m pthread resolv rt util xnet