diff options
author | Frederic Martinsons <frederic.martinsons@gmail.com> | 2023-03-31 07:45:24 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-04-01 11:36:26 +0100 |
commit | da1bcf08089d8276a156a221af405863b6746b7b (patch) | |
tree | d1a484e6745a8b2586141f2b6ede2275d2299d90 /meta | |
parent | ddf65370a905987caf94faaf2085083c966160d8 (diff) | |
download | poky-da1bcf08089d8276a156a221af405863b6746b7b.tar.gz |
devtool: add support for multiple git url inside a cargo based recipe
Without that, the possible git urls that are in SRC_URI of a recipe
are removed from SRC_URI during devtool process and so the
cargo_common_do_patch_paths in cargo_common.bbclass cannot
patch these packages to fetch them locally.
I use a generic type name because I foresee this change will
be useful for recipe that used a package manager (cargo but also
npm) see https://bugzilla.yoctoproject.org/show_bug.cgi?id=11015
(From OE-Core rev: 474658a3681c343385c359a21c3693401217298d)
Signed-off-by: Frederic Martinsons <frederic.martinsons@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/externalsrc.bbclass | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass index 26c5803ee6..b00fdba8e9 100644 --- a/meta/classes/externalsrc.bbclass +++ b/meta/classes/externalsrc.bbclass | |||
@@ -68,9 +68,7 @@ python () { | |||
68 | for url in fetch.urls: | 68 | for url in fetch.urls: |
69 | url_data = fetch.ud[url] | 69 | url_data = fetch.ud[url] |
70 | parm = url_data.parm | 70 | parm = url_data.parm |
71 | if (url_data.type == 'file' or | 71 | if url_data.type in ['file', 'npmsw', 'crate'] or parm.get('type') in ['kmeta', 'git-dependency']: |
72 | url_data.type == 'npmsw' or url_data.type == 'crate' or | ||
73 | 'type' in parm and parm['type'] == 'kmeta'): | ||
74 | local_srcuri.append(url) | 72 | local_srcuri.append(url) |
75 | 73 | ||
76 | d.setVar('SRC_URI', ' '.join(local_srcuri)) | 74 | d.setVar('SRC_URI', ' '.join(local_srcuri)) |