From patchwork Thu Jul 14 23:51:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Pastrick X-Patchwork-Id: 10215 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 48ADBC433EF for ; Thu, 14 Jul 2022 23:51:22 +0000 (UTC) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web12.759.1657842678472390384 for ; Thu, 14 Jul 2022 16:51:18 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@linux.microsoft.com header.s=default header.b=kA2swMoT; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: ripastri@linux.microsoft.com) Received: from leda.corp.microsoft.com (unknown [50.35.98.180]) by linux.microsoft.com (Postfix) with ESMTPSA id B069A20FD0C6; Thu, 14 Jul 2022 16:51:17 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com B069A20FD0C6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1657842677; bh=TiVY8ADKAWwzghlF5xRomqqsLIcHgcpZx6gsZ7hY+vs=; h=From:To:Cc:Subject:Date:From; b=kA2swMoTUHhAsdx6ZVC7Skh7d4s6+I4DRuta00rg+RRa/KltL5iZx/YNxLTubnqq1 KrNHbi/u7exUBFJH9dryVlYmpBzEsdhlYqdl9OtPkdfX7Zn1KBQkAfDWrprHIgVIUP M+QBbcyVYPK5FiHTy7fZKj+Wbf3+oop9CS2K6Tes= From: Richard Pastrick To: openembedded-core@lists.openembedded.org Cc: alhe@linux.microsoft.com Subject: [kirkstone][PATCH 1/2] cargo_common.bbclass: enable bitbake vendoring for externalsrc Date: Thu, 14 Jul 2022 16:51:02 -0700 Message-Id: <20220714235103.75188-1-ripastri@linux.microsoft.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 ; Thu, 14 Jul 2022 23:51:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/168052 From: Chanho Park To support crate:// fetcher on externalsrc, we need to remove "-z ${EXTERNALSRC} check of bitbake vendoring. It is possible to disable vendoring by CARGO_DISABLE_BITBAKE_VENDORING = "1" if externalsrc-ed project does not want to enablt it. Signed-off-by: Chanho Park Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie Signed-off-by: Richard Pastrick --- meta/classes/cargo_common.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/cargo_common.bbclass b/meta/classes/cargo_common.bbclass index 90fad75415..39f32829fd 100644 --- a/meta/classes/cargo_common.bbclass +++ b/meta/classes/cargo_common.bbclass @@ -45,7 +45,7 @@ cargo_common_do_configure () { directory = "${CARGO_VENDORING_DIRECTORY}" EOF - if [ -z "${EXTERNALSRC}" ] && [ ${CARGO_DISABLE_BITBAKE_VENDORING} = "0" ]; then + if [ ${CARGO_DISABLE_BITBAKE_VENDORING} = "0" ]; then cat <<- EOF >> ${CARGO_HOME}/config [source.crates-io] From patchwork Thu Jul 14 23:51:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Pastrick X-Patchwork-Id: 10216 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 EE814C433EF for ; Thu, 14 Jul 2022 23:51:31 +0000 (UTC) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mx.groups.io with SMTP id smtpd.web08.765.1657842681636014994 for ; Thu, 14 Jul 2022 16:51:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@linux.microsoft.com header.s=default header.b=WqZAmTFI; spf=pass (domain: linux.microsoft.com, ip: 13.77.154.182, mailfrom: ripastri@linux.microsoft.com) Received: from leda.corp.microsoft.com (unknown [50.35.98.180]) by linux.microsoft.com (Postfix) with ESMTPSA id 07B4E20FD0C8; Thu, 14 Jul 2022 16:51:21 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 07B4E20FD0C8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1657842681; bh=lQEl3COAEmY5TWrdJprqqBYQwS7pza+6hQwJ+v/YgFE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WqZAmTFIZJ7zdHPgTRKb4lStAEtNnt2wuAaThfUCzuKsA6Cz7PCa2XGviKPnIKj2l mKEm6FZUtLiHP70ccHcvAuNSKm+DQ4ps/SBs0fvU+YpQQlnN2jpN+LCeL2hpDy1CAB vEiFP4JYpmLD5S2vnPtHOAmniCkO1+CSWVx8JmmY= From: Richard Pastrick To: openembedded-core@lists.openembedded.org Cc: alhe@linux.microsoft.com Subject: [kirkstone][PATCH 2/2] externalsrc.bbclass: support crate fetcher on externalsrc Date: Thu, 14 Jul 2022 16:51:03 -0700 Message-Id: <20220714235103.75188-2-ripastri@linux.microsoft.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220714235103.75188-1-ripastri@linux.microsoft.com> References: <20220714235103.75188-1-ripastri@linux.microsoft.com> 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 ; Thu, 14 Jul 2022 23:51:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/168053 From: Chanho Park To support crate:// fetcher on externalsrc, we need to make pass-through the URIs in SRC_URI. Signed-off-by: Chanho Park Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie Signed-off-by: Richard Pastrick --- meta/classes/externalsrc.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass index b2f216f361..90792a737b 100644 --- a/meta/classes/externalsrc.bbclass +++ b/meta/classes/externalsrc.bbclass @@ -68,7 +68,7 @@ python () { url_data = fetch.ud[url] parm = url_data.parm if (url_data.type == 'file' or - url_data.type == 'npmsw' or + url_data.type == 'npmsw' or url_data.type == 'crate' or 'type' in parm and parm['type'] == 'kmeta'): local_srcuri.append(url)