import kernel-6.12.0-34.el10

SOURCES/1001-fix-riscv.patch

+diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
+index a4263dfb5..488b8a99d 100644
+--- a/tools/bpf/bpftool/Makefile
++++ b/tools/bpf/bpftool/Makefile
+@@ -1,5 +1,6 @@
+ # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+ include ../../scripts/Makefile.include
++include ../../scripts/Makefile.arch
+ 
+ ifeq ($(srctree),)
+ srctree := $(patsubst %/,%,$(dir $(CURDIR)))
 diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
 index 1b22f0f37..857a5f7b4 100644
 --- a/tools/lib/bpf/Makefile
@@ -12,8 +23,23 @@ index 1b22f0f37..857a5f7b4 100644
  
  export prefix libdir src obj
  
+diff --git a/tools/scripts/Makefile.arch b/tools/scripts/Makefile.arch
+index f6a50f06d..eabfe9f41 100644
+--- a/tools/scripts/Makefile.arch
++++ b/tools/scripts/Makefile.arch
+@@ -7,8 +7,8 @@ HOSTARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
+                                   -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \
+                                   -e s/riscv.*/riscv/ -e s/loongarch.*/loongarch/)
+ 
+-ifndef ARCH
+-ARCH := $(HOSTARCH)
++ifeq ($(strip $(ARCH)),)
++override ARCH := $(HOSTARCH)
+ endif
+ 
+ SRCARCH := $(ARCH)
 diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
-index 75016962f..43a029318 100644
+index 5ac0b8261..55f51a31d 100644
 --- a/tools/testing/selftests/bpf/Makefile
 +++ b/tools/testing/selftests/bpf/Makefile
 @@ -10,6 +10,7 @@ TOOLSDIR := $(abspath ../../..)