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 ++ patches/verify.patch | 11 ----------- 2 files changed, 2 insertions(+), 11 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: diff --git a/patches/verify.patch b/patches/verify.patch index dbb5600e..0fda8411 100644 --- a/patches/verify.patch +++ b/patches/verify.patch @@ -62,17 +62,6 @@ struct x509_certificate { struct x509_certificate *next; struct x509_certificate *signer; /* Certificate that signed this one */ ---- a/net/wireless/Makefile -+++ b/net/wireless/Makefile -@@ -22,7 +22,7 @@ ifneq ($(CPTCFG_CFG80211_EXTRA_REGDB_KEYDIR),) - cfg80211-y += extra-certs.o - endif - --$(obj)/shipped-certs.c: $(wildcard $(srctree)/$(src)/certs/*.x509) -+$(obj)/shipped-certs.c: $(wildcard $(src)/certs/*.x509) - @echo " GEN $@" - @echo '#include "reg.h"' > $@ - @echo 'const u8 shipped_regdb_certs[] = {' >> $@ --- a/compat/verification/pkcs7_verify.c +++ b/compat/verification/pkcs7_verify.c @@ -150,7 +150,7 @@ -- cgit v1.2.3