Browse Source

Merge pull request #11088 from janh/vnstat2-2.6

vnstat2: update to version 2.6
lilik-openwrt-22.03
Hannu Nyman 5 years ago
committed by GitHub
parent
commit
3e8dc94ec0
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 34 deletions
  1. +4
    -23
      net/vnstat2/Makefile
  2. +0
    -11
      net/vnstat2/patches/990-remove-default-interface.patch

+ 4
- 23
net/vnstat2/Makefile View File

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=vnstat2 PKG_NAME:=vnstat2
PKG_VERSION:=2.4
PKG_VERSION:=2.6
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=vnstat-$(PKG_VERSION).tar.gz PKG_SOURCE:=vnstat-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://humdi.net/vnstat PKG_SOURCE_URL:=https://humdi.net/vnstat
PKG_HASH:=a0955999abd56d5463d257ffdccc9b1e9ad9ea504de81e64ba4c197f1245abaa
PKG_HASH:=89276e0a7281943edb554b874078278ad947dc312938a2451e03eb80679f7ff7
PKG_LICENSE:=GPL-2.0-only PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
@ -19,9 +19,8 @@ PKG_MAINTAINER:=Jan Hoffmann <jan@3e8.eu>
PKG_BUILD_DIR:=$(BUILD_DIR)/vnstat-${PKG_VERSION} PKG_BUILD_DIR:=$(BUILD_DIR)/vnstat-${PKG_VERSION}
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_DEPENDS:=libgd
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -65,25 +64,7 @@ define Package/vnstat2/conffiles
/etc/config/vnstat /etc/config/vnstat
endef 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 define Package/vnstat2/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin


+ 0
- 11
net/vnstat2/patches/990-remove-default-interface.patch View File

@ -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"

Loading…
Cancel
Save