aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2021-08-27 14:01:08 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-10-18 23:01:19 +0200
commit6ef63cae325453ec28112e4aa489adcd34fe2280 (patch)
treebc2a114e5900a4f0827e3be2f67827e23443eb06
parent7e7d09cbe0d50aba024ee79e3a5f34e9ca0fa795 (diff)
downloadbackports-6ef63cae325453ec28112e4aa489adcd34fe2280.tar.gz
gentree: fix $(srctree)/$(src) adjustment
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@intel.com>
-rwxr-xr-xgentree.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gentree.py b/gentree.py
index 04d9263d..ae2b1a73 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: