From: Mieczyslaw Nalewaj Date: Wed, 23 Apr 2025 05:28:26 +0000 (+0200) Subject: bpf-headers: fix kernel-$(PKG_PATCHVER) location X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e05cd6a153921c16bd79128d06125d87ca3d968;p=thirdparty%2Fopenwrt.git bpf-headers: fix kernel-$(PKG_PATCHVER) location Change kernel-$(PKG_PATCHVER) location to $(TOPDIR)/target/linux/generic/ Change required after commit 8865dadea7b94e7859b416d3b1931b897ea43c48 Signed-off-by: Mieczyslaw Nalewaj Signed-off-by: Felix Fietkau [fix include path] --- diff --git a/package/kernel/bpf-headers/Makefile b/package/kernel/bpf-headers/Makefile index a644f47ab72..118a5a0e171 100644 --- a/package/kernel/bpf-headers/Makefile +++ b/package/kernel/bpf-headers/Makefile @@ -14,8 +14,10 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=linux PKG_PATCHVER:=6.6 + # Manually include kernel version and hash from kernel details file -include $(INCLUDE_DIR)/kernel-$(PKG_PATCHVER) +GENERIC_PLATFORM_DIR := $(CURDIR)/../../../target/linux/generic +include $(GENERIC_PLATFORM_DIR)/kernel-$(PKG_PATCHVER) PKG_VERSION:=$(PKG_PATCHVER)$(strip $(LINUX_VERSION-$(PKG_PATCHVER))) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -23,7 +25,6 @@ PKG_SOURCE_URL:=@KERNEL/linux/kernel/v$(word 1,$(subst ., ,$(PKG_PATCHVER))).x PKG_HASH:=$(LINUX_KERNEL_HASH-$(strip $(PKG_VERSION))) PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/bpf-headers/$(PKG_NAME)-$(PKG_VERSION) -GENERIC_PLATFORM_DIR := $(CURDIR)/../../../target/linux/generic GENERIC_BACKPORT_DIR := $(GENERIC_PLATFORM_DIR)/backport$(if $(wildcard $(GENERIC_PLATFORM_DIR)/backport-$(PKG_PATCHVER)),-$(PKG_PATCHVER)) GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/pending$(if $(wildcard $(GENERIC_PLATFORM_DIR)/pending-$(PKG_PATCHVER)),-$(PKG_PATCHVER)) GENERIC_HACK_DIR := $(GENERIC_PLATFORM_DIR)/hack$(if $(wildcard $(GENERIC_PLATFORM_DIR)/hack-$(PKG_PATCHVER)),-$(PKG_PATCHVER))