diff mbox series

[02/30] gentree.py: Remoace space between -I and $(src)

Message ID 20201201220415.30582-3-hauke@hauke-m.de (mailing list archive)
State New, archived
Headers show
Series backports: Update to match kernel 5.10-rc6 | expand

Commit Message

Hauke Mehrtens Dec. 1, 2020, 10:03 p.m. UTC 
When I compile backports on Debian 9 against kernel 4.9 it fails to
compile because the include "-I $(src)" does not work, the "-I" is
somehow lost. When I remove the space between this it is working.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 gentree.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/gentree.py b/gentree.py
index 2a9f60d7..1fc9dbb1 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'\$\(srctree\)/\$\(src\)', '$(src)', data)
+            data = re.sub(r'-I ?\$\(srctree\)/\$\(src\)', '-I$(src)', data)
             data = re.sub(r'\$\(srctree\)', '$(backport_srctree)', data)
             data = re.sub(r'-Idrivers', '-I$(backport_srctree)/drivers', data)
             if bpid.integrate: