From 53da987cf26776b86af7fd8318a7553d55cf8dd2 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 13 Oct 2017 14:27:32 +0200 Subject: gentree: mangle $(srctree)/$(src) directly We used to patch this, before with the genregdb and now with the shipped-certs.c generation - just fix it in code instead so we don't have to deal with different patches. Signed-off-by: Johannes Berg --- gentree.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gentree.py') diff --git a/gentree.py b/gentree.py index a98aceb2..91893ad0 100755 --- a/gentree.py +++ b/gentree.py @@ -1016,6 +1016,8 @@ def process(kerneldir, copy_list_file, git_revision=None, data = open(os.path.join(root, f), 'r').read() 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'\$\(srctree\)', '$(backport_srctree)', data) data = re.sub(r'-Idrivers', '-I$(backport_srctree)/drivers', data) if bpid.integrate: -- cgit v1.2.3