From: Johannes Berg <johannes.berg@xxxxxxxxx>
We did an adjustment here, but only did it prefixed with -I,
but a long time ago cfg80211 started doing $(srctree)/$(src)
for the built-in certificates as well.
Fix the regex to always apply this also to other occurrences,
not just in cflags.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
---
gentree.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gentree.py b/gentree.py
index 1fc9dbb1dc37..2a9f60d7384b 100755
--- a/gentree.py
+++ b/gentree.py
@@ -1043,7 +1043,7 @@ def process(kerneldir, copy_list_file, git_revision=None,
for r in regexes:
data = r.sub(r'' + bpid.full_prefix + '\\1', data)
# we have an absolue path in $(src) since we compile out of tree
- data = re.sub(r'-I ?\$\(srctree\)/\$\(src\)', '-I$(src)', data)
+ data = re.sub(r'\$\(srctree\)/\$\(src\)', '$(src)', data)
data = re.sub(r'\$\(srctree\)', '$(backport_srctree)', data)
data = re.sub(r'-Idrivers', '-I$(backport_srctree)/drivers', data)
if bpid.integrate:
--
2.31.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
