From: Johannes Berg <johannes@sipsolutions.net>
To: backports@vger.kernel.org
Cc: Johannes Berg <johannes.berg@intel.com>
Subject: [PATCH] gentree: fix $(srctree)/$(src) adjustment
Date: Fri, 27 Aug 2021 14:01:08 +0200 [thread overview]
Message-ID: <20210827140108.ba4d435eaf5e.I3808fb9cfaa17561ed46170716158fbc1e008333@changeid> (raw)
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 --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:
--
2.31.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
reply other threads:[~2021-08-27 12:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210827140108.ba4d435eaf5e.I3808fb9cfaa17561ed46170716158fbc1e008333@changeid \
--to=johannes@sipsolutions.net \
--cc=backports@vger.kernel.org \
--cc=johannes.berg@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).