Skip to content

Commit

Permalink
bpftools: update to v5.11.16, simplify make
Browse files Browse the repository at this point in the history
Update to the latest stable upstream version.

Drop unneeded make variables to remove redundant assignments seen during
invocation of package Makefile.

Also remove the following patch now included upstream:

  * 200-fix-install-param-order-on-macos.patch

Compile and run-tested on malta/mips32be, using bpftool directly and also
libbpf (linked with tc) to inspect and load simple eBPF programs.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
  • Loading branch information
guidosarducci authored and ldir-EDB0 committed Apr 24, 2021
1 parent cf20f1b commit aabc632
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 16 deletions.
12 changes: 7 additions & 5 deletions package/network/utils/bpftools/Makefile
Expand Up @@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=bpftools
PKG_VERSION:=5.11.2
PKG_RELEASE:=2
PKG_VERSION:=5.11.16
PKG_RELEASE:=1

PKG_SOURCE:=linux-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/kernel/v5.x
PKG_HASH:=904a5b3cbaf5264ef8da6c7a5445fa7ea19168ad77fb83a7cc1b8ba95d52d0a0
PKG_HASH:=21163681d130cbce5a6be39019e2c69e44f284855ddd70b1a3bd039249540f43

PKG_MAINTAINER:=Tony Ambardar <itugrok@yahoo.com>

Expand Down Expand Up @@ -93,9 +93,11 @@ ifneq ($(BUILD_VARIANT),lib)
TARGET_LDFLAGS += -Wl,--gc-sections
endif

MAKE_FLAGS += \
MAKE_VARS = \
EXTRA_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)"

MAKE_FLAGS += \
BPFTOOL_VERSION="$(LINUX_VERSION)" \
FEATURES_DUMP="$(PKG_BUILD_DIR)/FEATURE-DUMP.openwrt" \
OUTPUT="$(PKG_BUILD_DIR)/" \
Expand Down

This file was deleted.

0 comments on commit aabc632

Please sign in to comment.