kselftests-bpf: add support for kernel 6.12

Support new libpcap dependency and drop an old kernel version dependency.
Also improve formatting and avoid using unneeded deferred make variables.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
Link: https://github.com/openwrt/openwrt/pull/18712
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/package/devel/kselftests-bpf/Makefile b/package/devel/kselftests-bpf/Makefile
index d69e1e6dc3dc63ba4d06f467e0659593236fe760..d2d988eb38efef44dafed99748b2f048f99e29dc 100644 (file)
--- a/package/devel/kselftests-bpf/Makefile
+++ b/package/devel/kselftests-bpf/Makefile
@@ -24,7 +24,7 @@ define Package/kselftests-bpf
   SECTION:=devel
   CATEGORY:=Development
   DEPENDS:= \
-       +libelf +zlib +libpthread +librt @!IN_SDK \
+       +libelf +zlib +libpthread +librt +!LINUX_6_6:libpcap @!IN_SDK \
        @KERNEL_DEBUG_FS @KERNEL_DEBUG_INFO_BTF @KERNEL_BPF_EVENTS
   TITLE:=Linux Kernel Selftests (BPF)
   URL:=http://www.kernel.org
@@ -34,13 +34,15 @@ define Package/kselftests-bpf/description
   kselftests-bpf is the Linux kernel BPF test suite
 endef
 
-EXE_TARGETS = test_verifier
+EXE_TARGETS:= \
+       test_verifier
 
-MOD_TARGETS = $(if $(call kernel_patchver_ge,6.4),bpf_testmod.ko)
+MOD_TARGETS:= \
+       bpf_testmod.ko
 
 MAKE_PATH:=tools/testing/selftests/bpf
 
-MAKE_VARS = \
+MAKE_VARS:= \
        ARCH="$(LINUX_KARCH)" \
        CROSS_COMPILE="$(TARGET_CROSS)" \
        EXTRA_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
@@ -48,7 +50,7 @@ MAKE_VARS = \
        TOOLCHAIN_INCLUDE="$(TOOLCHAIN_INC_DIRS)" \
        KBUILD_OUTPUT="$(LINUX_DIR)"
 
-MAKE_FLAGS = \
+MAKE_FLAGS:= \
        $(if $(findstring c,$(OPENWRT_VERBOSE)),V=1,V='') \
        OUTPUT=$(PKG_BUILD_DIR)
 
@@ -67,7 +69,7 @@ define Package/kselftests-bpf/install
        $(foreach tgt,$(EXE_TARGETS), \
                $(INSTALL_BIN) \
                        $(PKG_BUILD_DIR)/$(tgt) $(1)/usr/libexec/$(PKG_NAME); \
-)
+       )
 endef
 
 $(eval $(call BuildPackage,kselftests-bpf))