diff options
author | Paul Eggleton <paul.eggleton@microsoft.com> | 2022-07-11 21:06:56 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-12 23:56:09 +0100 |
commit | 4a9cb3b33ec4cde64c22d090cf69a0cb41c0891e (patch) | |
tree | 6da20705f6c11340b57f6a6e43da3582d40aca97 /scripts | |
parent | b72ee82a35221d758b8fd07beb286d3bc10f2094 (diff) | |
download | poky-4a9cb3b33ec4cde64c22d090cf69a0cb41c0891e.tar.gz |
devtool: ignore pn- overrides when determining SRC_URI overrides
If (perhaps foolishly) at your configuration level you have e.g.
SRC_URI_append_pn-recipename = " file://patchname.patch"
and then run devtool modify on a different recipe, an error occurs:
INFO: SRC_URI contains some conditional appends/prepends - will create branches to represent these
...
ERROR: [Errno 2] No such file or directory: '/path/to/downloads/patchname.patch'
pn- overrides would not constitute an alternative configuration that we
should handle in this context, so just ignore them to avoid the issue.
(From OE-Core rev: 3f2a812ade42ece0bb59b2d303125a91b29936dd)
Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.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, 3 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 4b50e3c63b..e53569c5cc 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
@@ -520,7 +520,9 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works | |||
520 | for event in history: | 520 | for event in history: |
521 | if not 'flag' in event: | 521 | if not 'flag' in event: |
522 | if event['op'].startswith((':append[', ':prepend[')): | 522 | if event['op'].startswith((':append[', ':prepend[')): |
523 | extra_overrides.append(event['op'].split('[')[1].split(']')[0]) | 523 | override = event['op'].split('[')[1].split(']')[0] |
524 | if not override.startswith('pn-'): | ||
525 | extra_overrides.append(override) | ||
524 | # We want to remove duplicate overrides. If a recipe had multiple | 526 | # We want to remove duplicate overrides. If a recipe had multiple |
525 | # SRC_URI_override += values it would cause mulitple instances of | 527 | # SRC_URI_override += values it would cause mulitple instances of |
526 | # overrides. This doesn't play nicely with things like creating a | 528 | # overrides. This doesn't play nicely with things like creating a |