|
Michal Suchanek |
df46e8 |
From 5fbea42387eba1c7517fcad79099df706def7054 Mon Sep 17 00:00:00 2001
|
|
Michal Suchanek |
37f788 |
From: Michal Suchanek <msuchanek@suse.de>
|
|
Michal Suchanek |
df46e8 |
Date: Mon, 9 Jan 2023 12:34:42 +0100
|
|
Michal Suchanek |
37f788 |
Subject: [PATCH] bpf_doc: Fix build error with older python versions
|
|
Michal Suchanek |
37f788 |
|
|
Michal Suchanek |
37f788 |
References: TypeError: '_sre.SRE_Match' object is not subscriptable
|
|
Michal Suchanek |
df46e8 |
Patch-mainline: queued
|
|
Michal Suchanek |
df46e8 |
Git-commit: 5fbea42387eba1c7517fcad79099df706def7054
|
|
Michal Suchanek |
df46e8 |
Git-repo: https://git.kernel.org/bpf/bpf-next
|
|
Michal Suchanek |
df46e8 |
|
|
Michal Suchanek |
df46e8 |
The ability to subscript match result as an array is only available
|
|
Michal Suchanek |
df46e8 |
since python 3.6. Existing code in bpf_doc uses the older group()
|
|
Michal Suchanek |
df46e8 |
interface but commit 8a76145a2ec2 adds code using the new interface.
|
|
Michal Suchanek |
df46e8 |
|
|
Michal Suchanek |
df46e8 |
Use the old interface consistently to avoid build error on older
|
|
Michal Suchanek |
df46e8 |
distributions like the below:
|
|
Michal Suchanek |
37f788 |
|
|
Michal Suchanek |
37f788 |
+ make -j48 -s -C /dev/shm/kbuild/linux.33946/current ARCH=powerpc HOSTCC=gcc CROSS_COMPILE=powerpc64-suse-linux- clean
|
|
Michal Suchanek |
37f788 |
TypeError: '_sre.SRE_Match' object is not subscriptable
|
|
Michal Suchanek |
37f788 |
|
|
Michal Suchanek |
37f788 |
Fixes: 8a76145a2ec2 ("bpf: explicitly define BPF_FUNC_xxx integer values")
|
|
Michal Suchanek |
37f788 |
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
|
|
Michal Suchanek |
df46e8 |
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
|
|
Michal Suchanek |
df46e8 |
Acked-by: Quentin Monnet <quentin@isovalent.com>
|
|
Michal Suchanek |
df46e8 |
Link: https://lore.kernel.org/bpf/20230109113442.20946-1-msuchanek@suse.de
|
|
Michal Suchanek |
df46e8 |
Acked-by: Michal Suchanek <msuchanek@suse.de>
|
|
Michal Suchanek |
37f788 |
---
|
|
Michal Suchanek |
37f788 |
scripts/bpf_doc.py | 2 +-
|
|
Michal Suchanek |
37f788 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Michal Suchanek |
37f788 |
|
|
Michal Suchanek |
37f788 |
diff --git a/scripts/bpf_doc.py b/scripts/bpf_doc.py
|
|
Michal Suchanek |
37f788 |
index e8d90829f23e..38d51e05c7a2 100755
|
|
Michal Suchanek |
37f788 |
--- a/scripts/bpf_doc.py
|
|
Michal Suchanek |
37f788 |
+++ b/scripts/bpf_doc.py
|
|
Michal Suchanek |
37f788 |
@@ -271,7 +271,7 @@ class HeaderParser(object):
|
|
Michal Suchanek |
37f788 |
if capture:
|
|
Michal Suchanek |
37f788 |
fn_defines_str += self.line
|
|
Michal Suchanek |
37f788 |
helper_name = capture.expand(r'bpf_\1')
|
|
Michal Suchanek |
37f788 |
- self.helper_enum_vals[helper_name] = int(capture[2])
|
|
Michal Suchanek |
37f788 |
+ self.helper_enum_vals[helper_name] = int(capture.group(2))
|
|
Michal Suchanek |
37f788 |
self.helper_enum_pos[helper_name] = i
|
|
Michal Suchanek |
37f788 |
i += 1
|
|
Michal Suchanek |
37f788 |
else:
|
|
Michal Suchanek |
37f788 |
--
|
|
Michal Suchanek |
37f788 |
2.35.3
|
|
Michal Suchanek |
37f788 |
|