[openwrt/openwrt] bpf-headers: fix kernel-$(PKG_PATCHVER) location

LEDE Commits lede-commits at lists.infradead.org
Wed Apr 23 01:29:27 PDT 2025


nbd pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/0e05cd6a153921c16bd79128d06125d87ca3d968

commit 0e05cd6a153921c16bd79128d06125d87ca3d968
Author: Mieczyslaw Nalewaj <namiltd at yahoo.com>
AuthorDate: Wed Apr 23 07:28:26 2025 +0200

    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 <namiltd at yahoo.com>
    Signed-off-by: Felix Fietkau <nbd at nbd.name> [fix include path]
---
 package/kernel/bpf-headers/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/kernel/bpf-headers/Makefile b/package/kernel/bpf-headers/Makefile
index a644f47ab7..118a5a0e17 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))




More information about the lede-commits mailing list