bpf-headers: drop HOST_LOADLIBES

[openwrt/staging/stintel.git] / package / kernel / bpf-headers / Makefile

diff --git a/package/kernel/bpf-headers/Makefile b/package/kernel/bpf-headers/Makefile
index 5f5b89370d7c0b14efc227f1fcfaf67bb5d4e1df..6d25a7386f2e279a9cc0b4541a0439b261e20906 100644 (file)
--- a/package/kernel/bpf-headers/Makefile
+++ b/package/kernel/bpf-headers/Makefile
@@ -13,13 +13,17 @@ include $(INCLUDE_DIR)/kernel.mk
 
 
 PKG_NAME:=linux
-PKG_PATCHVER:=5.10
+PKG_PATCHVER:=5.15
+# Manually include kernel version and hash from kernel details file
+include $(INCLUDE_DIR)/kernel-$(PKG_PATCHVER)
+
 PKG_VERSION:=$(PKG_PATCHVER)$(strip $(LINUX_VERSION-$(PKG_PATCHVER)))
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=$(LINUX_SITE)
 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))
@@ -41,6 +45,8 @@ define Package/bpf-headers
   HIDDEN:=1
 endef
 
+PKG_CONFIG_PATH:=
+
 export HOST_EXTRACFLAGS=-I$(STAGING_DIR_HOST)/include
 
 KERNEL_MAKE := \
@@ -50,7 +56,6 @@ KERNEL_MAKE := \
                LLVM=1 CC="$(CLANG)" LD="$(TARGET_CROSS)ld" \
                HOSTCC="$(HOSTCC)" \
                HOSTCXX="$(HOSTCXX)" \
-               HOST_LOADLIBES="-L$(STAGING_DIR_HOST)/lib" \
                KBUILD_HOSTLDLIBS="-L$(STAGING_DIR_HOST)/lib" \
                CONFIG_SHELL="$(BASH)" \
                INSTALL_HDR_PATH="$(PKG_BUILD_DIR)/user_headers"
@@ -59,11 +64,17 @@ define Build/Patch
        $(Kernel/Patch/Default)
 endef
 
-BPF_DOC = $(PKG_BUILD_DIR)/scripts/bpf_helpers_doc.py
+BPF_DOC = $(PKG_BUILD_DIR)/scripts/bpf_doc.py
+
+define Build/Configure/64
+       echo 'CONFIG_CPU_MIPS64_R2=y' >> $(PKG_BUILD_DIR)/.config
+       echo 'CONFIG_64BIT=y' >> $(PKG_BUILD_DIR)/.config
+endef
 
 define Build/Configure
        grep -vE 'CONFIG_(CPU_.*ENDIAN|HZ)' $(PKG_BUILD_DIR)/arch/mips/configs/generic_defconfig > $(PKG_BUILD_DIR)/.config
        echo 'CONFIG_CPU_$(if $(CONFIG_BIG_ENDIAN),BIG,LITTLE)_ENDIAN=y' >> $(PKG_BUILD_DIR)/.config
+       $(if $(CONFIG_ARCH_64BIT),$(Build/Configure/64))
        grep CONFIG_HZ $(REAL_LINUX_DIR)/.config >> $(PKG_BUILD_DIR)/.config
        yes '' | $(KERNEL_MAKE) oldconfig
        grep 'CONFIG_HZ=' $(REAL_LINUX_DIR)/.config | \
@@ -94,6 +105,9 @@ define Build/InstallDev
                $(PKG_BUILD_DIR)/scripts \
                $(PKG_BUILD_DIR)/user_headers \
                $(1)/bpf-headers
+       $(CP) \
+               $(CURDIR)/files/stdarg.h \
+               $(1)/bpf-headers/include
 endef
 
 $(eval $(call BuildPackage,bpf-headers))