]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
musl: Delete GLIBC_LDSO before creating symlink with lnr
authorKhem Raj <raj.khem@gmail.com>
Wed, 14 Aug 2019 05:19:18 +0000 (22:19 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 14 Aug 2019 16:33:49 +0000 (17:33 +0100)
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>
meta/recipes-core/musl/musl_git.bb

index c3786c4eb33b631c89c0b8b64ddd6d07af272291..6425b5cd362e7ae1968196c5e9575b055d2a1482 100644 (file)
@@ -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