diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2024-02-15 23:12:50 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-16 15:14:26 +0000 |
commit | 37aa0e077ad319dd0000a48a23db64fac1cbd4dc (patch) | |
tree | 5250244e133208b73e207d9a7f0bde5b9171e8ae /scripts | |
parent | f3a72a2862273a469d6e51b6b2d6c55f105d9241 (diff) | |
download | poky-37aa0e077ad319dd0000a48a23db64fac1cbd4dc.tar.gz |
devtool: modify: Correct appending of type=git-dependency to URIs
A missing space when using :append would lead to run-on URIs if there
was no whitespace at the end of the original SRC_URI.
(From OE-Core rev: 4de0c679e4b1a3cb394f348d625b97ad73f1efe7)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/devtool/standard.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 8fb4b934d4..0243e3bc75 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -966,7 +966,7 @@ def modify(args, config, basepath, workspace): | |||
966 | # Assume first entry is main source extracted in ${S} so skip it | 966 | # Assume first entry is main source extracted in ${S} so skip it |
967 | src_uri = src_uri[1::] | 967 | src_uri = src_uri[1::] |
968 | 968 | ||
969 | #Add "type=git-dependency" to all non local sources | 969 | # Add "type=git-dependency" to all non local sources |
970 | for url in src_uri: | 970 | for url in src_uri: |
971 | if not url.startswith('file://') and not 'type=' in url: | 971 | if not url.startswith('file://') and not 'type=' in url: |
972 | src_uri_remove.append(url) | 972 | src_uri_remove.append(url) |
@@ -974,7 +974,7 @@ def modify(args, config, basepath, workspace): | |||
974 | 974 | ||
975 | if src_uri_remove: | 975 | if src_uri_remove: |
976 | f.write('SRC_URI:remove = "%s"\n' % ' '.join(src_uri_remove)) | 976 | f.write('SRC_URI:remove = "%s"\n' % ' '.join(src_uri_remove)) |
977 | f.write('SRC_URI:append = "%s"\n\n' % ' '.join(src_uri_append)) | 977 | f.write('SRC_URI:append = " %s"\n\n' % ' '.join(src_uri_append)) |
978 | 978 | ||
979 | f.write('FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n') | 979 | f.write('FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n') |
980 | # Local files can be modified/tracked in separate subdir under srctree | 980 | # Local files can be modified/tracked in separate subdir under srctree |