From 42be849af8c2efb4c435b07369bb59dd6a2f2569 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 18 May 2023 15:55:59 +0200 Subject: [PATCH] generic: use latest kernel headers when building eBPF tools Signed-off-by: John Crispin --- ...x-add-the-Qualcomm-AX-target-support.patch | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/patches/ipq807x/0002-ipq807x-add-the-Qualcomm-AX-target-support.patch b/patches/ipq807x/0002-ipq807x-add-the-Qualcomm-AX-target-support.patch index 183f5e8fb..7f30179d6 100644 --- a/patches/ipq807x/0002-ipq807x-add-the-Qualcomm-AX-target-support.patch +++ b/patches/ipq807x/0002-ipq807x-add-the-Qualcomm-AX-target-support.patch @@ -1,12 +1,12 @@ -From cdf38e603db5c5e2522c73d87cc956386c5baf0e Mon Sep 17 00:00:00 2001 +From 16eb7167800a5d897e5090d25fba8fe22c88af4d Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 29 Mar 2023 07:49:25 +0200 -Subject: [PATCH] ipq807x: add the Qualcomm AX target support +Subject: [PATCH 01/14] ipq807x: add the Qualcomm AX target support Signed-off-by: John Crispin --- config/Config-images.in | 4 + - config/Config-kernel.in | 12 + + config/Config-kernel.in | 9 + include/image.mk | 8 +- include/kernel-version.mk | 7 +- include/kernel.mk | 8 +- @@ -32,8 +32,8 @@ Signed-off-by: John Crispin target/linux/generic/config-5.4-qsdk | 6189 ++++++++++++++++++++ toolchain/gcc/Config.in | 5 + toolchain/gcc/Config.version | 1 + - toolchain/kernel-headers/Makefile | 14 +- - 28 files changed, 11284 insertions(+), 47 deletions(-) + toolchain/kernel-headers/Makefile | 13 +- + 28 files changed, 11280 insertions(+), 47 deletions(-) create mode 100644 package/boot/uboot-envtools/files/ipq50xx create mode 100644 package/boot/uboot-envtools/files/ipq60xx create mode 100644 package/boot/uboot-envtools/files/ipq807x @@ -56,7 +56,7 @@ index 2921cd5bca..87d63a696a 100644 depends on TARGET_ROOTFS_INITRAMFS help diff --git a/config/Config-kernel.in b/config/Config-kernel.in -index d4648a5064..96f3fc2a09 100644 +index d4648a5064..444aa5c973 100644 --- a/config/Config-kernel.in +++ b/config/Config-kernel.in @@ -2,6 +2,15 @@ @@ -11857,29 +11857,28 @@ index 09deae3bf1..d9c65d6a5b 100644 config GCC_VERSION_7 diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile -index eea0ffbde0..a97f230d57 100644 +index eea0ffbde0..3bd0bfc266 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile -@@ -14,6 +14,18 @@ override HOST_QUILT:= +@@ -14,6 +14,17 @@ override HOST_QUILT:= include $(INCLUDE_DIR)/kernel.mk -+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 ++# TIP ++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 + PKG_NAME:=linux PKG_VERSION:=$(LINUX_VERSION) PKG_SOURCE:=$(LINUX_SOURCE) -@@ -32,7 +44,7 @@ else +@@ -32,7 +43,7 @@ else PKG_SOURCE:=$(LINUX_SOURCE) PKG_SOURCE_URL:=$(LINUX_SITE) endif