summaryrefslogtreecommitdiff
path: root/gentree.py
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2017-10-13 14:27:32 +0200
committerJohannes Berg <johannes.berg@intel.com>2017-10-13 15:29:52 +0200
commit53da987cf26776b86af7fd8318a7553d55cf8dd2 (patch)
treef3a6f9eafaa628c9be13d91a1f4b620fb7f88680 /gentree.py
parentdeaa397ea3d6c1ae5f7b6c089e8b805c02b293e5 (diff)
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 <johannes.berg@intel.com>
Diffstat (limited to 'gentree.py')
-rwxr-xr-xgentree.py2
1 files changed, 2 insertions, 0 deletions
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: