From 6fabaeca53b759f89249f051197c54a94c20d059 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 26 May 2022 09:28:59 +0200 Subject: [PATCH] kernel-headers: make sure that the QSDK v5.4 kernel has access to the wireshark headers Fixes: WIFI-7571 Signed-off-by: John Crispin --- ...rnel-headers-add-v3.18-v5.10-support.patch | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/patches/rtkmipsel/0003-kernel-headers-add-v3.18-v5.10-support.patch b/patches/rtkmipsel/0003-kernel-headers-add-v3.18-v5.10-support.patch index d4b825b67..44529672f 100644 --- a/patches/rtkmipsel/0003-kernel-headers-add-v3.18-v5.10-support.patch +++ b/patches/rtkmipsel/0003-kernel-headers-add-v3.18-v5.10-support.patch @@ -1,29 +1,31 @@ -From 31fce48f28737edf367f59b1b1a2a9474795c826 Mon Sep 17 00:00:00 2001 +From 414f0c79a0fac86020f220b6feba518926420491 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 7 May 2022 19:50:33 +0200 -Subject: [PATCH] kernel-headers: add v3.18->v5.10 support +Subject: [PATCH 4/4] kernel-headers: add v3.18->v5.10 support Signed-off-by: John Crispin --- - toolchain/kernel-headers/Makefile | 10 ++++++++++ - 1 file changed, 10 insertions(+) + toolchain/kernel-headers/Makefile | 12 ++++++++++++ + 1 file changed, 12 insertions(+) diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile -index eea0ffbde0..a70cf2c58c 100644 +index c33f26d46d..a97f230d57 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile -@@ -14,6 +14,16 @@ override HOST_QUILT:= +@@ -14,6 +14,18 @@ override HOST_QUILT:= include $(INCLUDE_DIR)/kernel.mk -+ifneq ($(filter 3.18,$(KERNEL_PATCHVER)),) -+ KERNEL_PATCHVER := 5.10 -+ KERNEL_NAME_SUFFIX:= ++ifneq ($(KERNEL_NAME_SUFFIX),) ++ KERNEL_PATCHVER := 5.10 ++ KERNEL_NAME_SUFFIX:= + GENERIC_BACKPORT_DIR := $(GENERIC_PLATFORM_DIR)/backport$(if $(wildcard $(GENERIC_PLATFORM_DIR)/backport-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) + GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/pending$(if $(wildcard $(GENERIC_PLATFORM_DIR)/pending-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) + GENERIC_HACK_DIR := $(GENERIC_PLATFORM_DIR)/hack$(if $(wildcard $(GENERIC_PLATFORM_DIR)/hack-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) + GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),"$(dir)") + $(warning GENERIC_BACKPORT_DIR = $(GENERIC_BACKPORT_DIR)) ++ include $(INCLUDE_DIR)/kernel-version.mk ++ include $(INCLUDE_DIR)/kernel.mk +endif + PKG_NAME:=linux