From patchwork Tue Mar 8 14:30:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 4935 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBA47C43217 for ; Tue, 8 Mar 2022 14:30:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.8696.1646749839836237730 for ; Tue, 08 Mar 2022 06:30:40 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D2FE9139F for ; Tue, 8 Mar 2022 06:30:38 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7DCB53FA58 for ; Tue, 8 Mar 2022 06:30:37 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/6] flit_core: respect PIP_INSTALL_DIST_PATH Date: Tue, 8 Mar 2022 14:30:30 +0000 Message-Id: <20220308143035.3569559-1-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 08 Mar 2022 14:30:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/162924 pip_install_wheel expects the wheels to be in PIP_INSTALL_DIST_PATH but this class was writing to the same directory through chance not design. Respect PIP_INSTALL_DIST_PATH as the output directory, and use [cleandirs] to ensure that it exists and is empty. Also call the flit_core.wheel module directly as this is a public entry point to the wheel building logic. Signed-off-by: Ross Burton --- meta/classes/flit_core.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/flit_core.bbclass b/meta/classes/flit_core.bbclass index a7667795fe..3481bb5089 100644 --- a/meta/classes/flit_core.bbclass +++ b/meta/classes/flit_core.bbclass @@ -8,8 +8,8 @@ flit_core_do_configure () { # TODO: ideally this uses pypa/build flit_core_do_compile () { - mkdir -p ${S}/dist - nativepython3 -c "from flit_core import buildapi; buildapi.build_wheel('./dist')" + nativepython3 -mflit_core.wheel --outdir ${PIP_INSTALL_DIST_PATH} } +do_compile[cleandirs] += "${PIP_INSTALL_DIST_PATH}" EXPORT_FUNCTIONS do_configure do_compile