From 60a8dca0b99a37b8a9bfcbc605a77d3443372db6 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Tue, 19 Mar 2024 14:28:38 -0700 Subject: [PATCH] python: lib: kernel: Drop -Wstring-compare patch This has been resolved with https://git.kernel.org/linus/24f5bb9f24ad80da6c6f83ba6124b5188c5384b2. Signed-off-by: Nathan Chancellor --- python/lib/kernel.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/python/lib/kernel.py b/python/lib/kernel.py index 9abb42ad..0f1c7147 100755 --- a/python/lib/kernel.py +++ b/python/lib/kernel.py @@ -4,7 +4,6 @@ import os from pathlib import Path -import re import shutil import subprocess import sys @@ -41,17 +40,6 @@ def prepare_source(base_name, base_ref='origin/master'): subprocess.run(['git', 'remote', 'update', '--prune', 'origin'], check=True, cwd=source_folder) subprocess.run(['git', 'reset', '--hard', base_ref], check=True, cwd=source_folder) - if re.search( - r'\(src\) != __data_offsets.dst##_ptr_', - source_folder.joinpath('include/trace/stages/stage6_event_callback.h').read_text( - encoding='utf-8')): - # tracing: Ignore -Wstring-compare with diagnostic macros - patches.append( - Path( - os.environ['NVME_FOLDER'], - 'data/tmp-patches/20240319_nathan_tracing_ignore_wstring_compare_with_diagnostic_macros.patch', - )) - # pylint: disable=subprocess-run-check try: common_kwargs = {'check': True, 'cwd': source_folder, 'text': True}