diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-01-21 17:24:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-21 17:24:02 +0200 |
| commit | 3e8dc94ec00a94411d92822937ad7f9ebcc872b4 (patch) | |
| tree | 0be920d5c0762e4d47a807e714b83633c6fe73d4 /net | |
| parent | 8eab02fda1c197a9a681eb2f908d4d943d9e48ae (diff) | |
| parent | 39f14559265e507ced44b864db98eaeab69d8afe (diff) | |
Merge pull request #11088 from janh/vnstat2-2.6
vnstat2: update to version 2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/vnstat2/Makefile | 27 | ||||
| -rw-r--r-- | net/vnstat2/patches/990-remove-default-interface.patch | 11 |
2 files changed, 4 insertions, 34 deletions
diff --git a/net/vnstat2/Makefile b/net/vnstat2/Makefile index abf0d52cf..15e764d09 100644 --- a/net/vnstat2/Makefile +++ b/net/vnstat2/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vnstat2 -PKG_VERSION:=2.4 +PKG_VERSION:=2.6 PKG_RELEASE:=1 PKG_SOURCE:=vnstat-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://humdi.net/vnstat -PKG_HASH:=a0955999abd56d5463d257ffdccc9b1e9ad9ea504de81e64ba4c197f1245abaa +PKG_HASH:=89276e0a7281943edb554b874078278ad947dc312938a2451e03eb80679f7ff7 PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=COPYING @@ -19,9 +19,8 @@ PKG_MAINTAINER:=Jan Hoffmann <jan@3e8.eu> PKG_BUILD_DIR:=$(BUILD_DIR)/vnstat-${PKG_VERSION} +PKG_FIXUP:=autoreconf PKG_INSTALL:=1 - -PKG_BUILD_DEPENDS:=libgd PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -65,25 +64,7 @@ define Package/vnstat2/conffiles /etc/config/vnstat endef -define Build/Compile/vnstat2 - +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" -endef - -define Build/Compile/vnstati2 - +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ - LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib" \ - all -endef - -define Build/Compile -$(call Build/Compile/vnstat2) -$(call Build/Compile/vnstati2) -endef +CONFIGURE_ARGS += --disable-extra-paths define Package/vnstat2/install $(INSTALL_DIR) $(1)/usr/bin diff --git a/net/vnstat2/patches/990-remove-default-interface.patch b/net/vnstat2/patches/990-remove-default-interface.patch deleted file mode 100644 index 1ae1faad7..000000000 --- a/net/vnstat2/patches/990-remove-default-interface.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cfg/vnstat.conf -+++ b/cfg/vnstat.conf -@@ -2,7 +2,7 @@ - ## - - # default interface (leave empty for automatic selection) --Interface "" -+#Interface "" - - # location of the database directory - DatabaseDir "/var/lib/vnstat" |