From patchwork Wed Aug 14 05:19:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 171227 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp354308ily; Tue, 13 Aug 2019 22:20:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqwKzO3AW9cvSwc5/mqOLxOLioCk2VaVCnTkQdozpqDhLjsjWhwUFf21J7cxwvOAmeNfxTb4 X-Received: by 2002:a17:902:2f05:: with SMTP id s5mr36691374plb.170.1565760006775; Tue, 13 Aug 2019 22:20:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565760006; cv=none; d=google.com; s=arc-20160816; b=i6NjHWiL3rgpN5aKB2+vm8P7dzxtrlRv3Poo5ex9wv7EfOA8nGjWR5OFGZbVmnu3HW mUG/7OHikOa5qJUGFyn4AuRtteCkI0QuwjwNP8CrkGo0IPa2zLwWXDidR1cqxGP7y2/y Tj2AOOcb9m/kLt2Ff3RnvFsRO+bj+wwCI9M7XEAWlMtiFhSJxYJ74uOmqopXcIBx5Riw bX8/y92GVWSvqDzx1FXZ3PReCtAui2XFHXFVadOvHkwdiBh1hSBClEkv651T9hQ2vZ4u OzQQf3GbDlXSsspcyr+H2uIWOsuOZCHNrGJT0UVDmy50MFGKPl5KY6kc87WE1Licp9u3 Woew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=ryHTvl5LdaOdiAHugVD9ve1wM+uKVzQRiJsBeaQotp8=; b=zokkpKCR7QPDdOR9ZqwqOyUvTwT+U8MaFo1eEmpy56biVPpzwPqhl9y34vSBFf1rOU a4RKPWQN1jdJ3NHuWgZIfVRJxibIGAgIdfcgA01hxBSQ7GqIZJzrfyO8LlzE4T2+VMYD cVp2kMpTdGMoLq7RDyZ2l5T+Rox3rBbPt1IkiLqbBYt2Okj0xW9e7EoDe6qPGU/hRoaS 6qYOwsMJ3MDDUg5XYD7svegeXYZxKVC2y1/oM23CLNr/fGV2+McqUQHfttf/06EdAt0x 3xvhrLI3+p6v0TDIAxQEDI0AZO/bkAEAJSMpYv/wcceBtTavl5C/Qp7yvoAbRgoVvNXz BZ3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eEEIq2n6; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id q24si10903249pls.7.2019.08.13.22.20.06; Tue, 13 Aug 2019 22:20:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=eEEIq2n6; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 88B627EAC3; Wed, 14 Aug 2019 05:20:03 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mail.openembedded.org (Postfix) with ESMTP id ABD937CE73 for ; Wed, 14 Aug 2019 05:19:30 +0000 (UTC) Received: by mail-pl1-f178.google.com with SMTP id t14so50181173plr.11 for ; Tue, 13 Aug 2019 22:19:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zC/TLTGDlM20gyxKvZ3dJiZlHhr18nffMURklHGMGyw=; b=eEEIq2n60IDv23HSdngaCPFQdoTZ6n3tQcTWu1YotXrmfXudMnXx17HhSnWtLy4bg8 dbcvqogIYWIFwFlFId/0qZBPmuWFsHYapgSmg9VBsFLmLJf6An0sP+kgf28khr06wu4W Fl/DKNsLb8MhTYkaCPBOnhtSH1gwGsi6UevoVLC33FxEl4pRzH7WKuXG6t8HfLSEevKU JH3rhX/k4Ttue0GUTL1UQWzrmPmNdS8eDI1bvdwxqDDK4Ro1UjgpFGv6UPWEFYJ3v5XP NpDfjRdXuW63VgwkX0bgUB0M1tP+3rT+BF9x7Owf7mg1kMs+pt1Klh2ONCY61gdDwfre JK0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zC/TLTGDlM20gyxKvZ3dJiZlHhr18nffMURklHGMGyw=; b=Tjo7ooMYwT87N1IjytdjBX5jsq8MTFTlF+p7W4gNx5z1qPC3Sis2wOt2E+9b9x7Qum 4N2PwJBvn703tlKqrEjSr2n6lcSUU6RNKLm510BJ1c2AHzDLHztr7jaAAEL97UqracMP eKGRLOUa5GM1HKwPPm6EvYPZ6NHAcQB2oSAzFj1COGZquVoAs751zl2D/TFj002HF7Xn jXG+rpWrnJMEIoRq8x2Qa5zRRVvQC0Z7LBY+oLEFwhKgs0n/0BoryXnZoZSaisV2ESmW eC4gKdWFMuFXY1zIMXnt+lRZB5NWSja34gP/yn9HzKpjXneJkp7jGgMbMPf/9XJD36KB S/Wg== X-Gm-Message-State: APjAAAWU7LIuqswUgUclOXMMkCAEs8LKuzhwSdUmMkUOSgJMBxSjJ6oD QIUMo6QUK2sXidQVXoOjhAzvGOxiuTU= X-Received: by 2002:a17:902:6a:: with SMTP id 97mr1230462pla.257.1565759971265; Tue, 13 Aug 2019 22:19:31 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net (c-73-71-176-3.hsd1.ca.comcast.net. [73.71.176.3]) by smtp.gmail.com with ESMTPSA id v22sm107805527pgk.69.2019.08.13.22.19.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2019 22:19:30 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Tue, 13 Aug 2019 22:19:18 -0700 Message-Id: <20190814051918.42678-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190814051918.42678-1-raj.khem@gmail.com> References: <20190814051918.42678-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 2/2] musl: Delete GLIBC_LDSO before creating symlink with lnr X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org 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 --- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.22.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 2633229b8c..b2991d4ed5 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb @@ -64,7 +64,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