From: "Kamel Bouhara" <kamel.bouhara@bootlin.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Kamel Bouhara <kamel.bouhara@bootlin.com>
Subject: [PATCH 2/2] recipetool: create: only add npmsw url if required
Date: Thu, 14 Jan 2021 08:12:35 +0100 [thread overview]
Message-ID: <20210114071235.2210763-3-kamel.bouhara@bootlin.com> (raw)
In-Reply-To: <20210114071235.2210763-1-kamel.bouhara@bootlin.com>
Before adding a npmsw fetcher to a recipe we
should first check if the generated shrinkwrap file
contains dependencies.
Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com>
---
scripts/lib/recipetool/create_npm.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/recipetool/create_npm.py b/scripts/lib/recipetool/create_npm.py
index 579b7ae48a..2bcae91dfa 100644
--- a/scripts/lib/recipetool/create_npm.py
+++ b/scripts/lib/recipetool/create_npm.py
@@ -204,6 +204,9 @@ class NpmRecipeHandler(RecipeHandler):
self._run_npm_install(d, srctree, registry, dev)
shrinkwrap_file = self._generate_shrinkwrap(d, srctree, dev)
+ with open(shrinkwrap_file, "r") as f:
+ shrinkwrap = json.load(f)
+
if os.path.exists(lock_copy):
bb.utils.movefile(lock_copy, lock_file)
@@ -226,7 +229,8 @@ class NpmRecipeHandler(RecipeHandler):
value = origvalue.replace("version=" + data["version"], "version=${PV}")
value = value.replace("version=latest", "version=${PV}")
values = [line.strip() for line in value.strip('\n').splitlines()]
- values.append(url_recipe)
+ if "dependencies" in shrinkwrap:
+ values.append(url_recipe)
return values, None, 4, False
(_, newlines) = bb.utils.edit_metadata(lines_before, ["SRC_URI"], _handle_srcuri)
--
2.11.0
next prev parent reply other threads:[~2021-01-14 7:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-14 7:12 [PATCH 0/2] Fix issue with npm shrinkwrap fetcher kamel.bouhara
2021-01-14 7:12 ` [PATCH 1/2] npm.bbclass: make shrinkwrap file optional Kamel Bouhara
2021-01-14 7:12 ` Kamel Bouhara [this message]
2021-01-14 14:25 ` [OE-core] [PATCH 0/2] Fix issue with npm shrinkwrap fetcher Jean-Marie Lemetayer
2021-01-14 15:40 ` Kamel Bouhara
2021-02-03 9:55 ` Zoltan Boszormenyi
2021-02-05 1:40 ` Anuj Mittal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210114071235.2210763-3-kamel.bouhara@bootlin.com \
--to=kamel.bouhara@bootlin.com \
--cc=alexandre.belloni@bootlin.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox