diff mbox series

gentree: fix $(srctree)/$(src) adjustment

Message ID 20210827140108.ba4d435eaf5e.I3808fb9cfaa17561ed46170716158fbc1e008333@changeid (mailing list archive)
State New, archived
Headers show
Series gentree: fix $(srctree)/$(src) adjustment | expand

Commit Message

Johannes Berg Aug. 27, 2021, 12:01 p.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

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>
---
 gentree.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

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: