vnstat: bump to version 1.15
PATCH v2 1/1 vnstat: bump to version 1.15
Also:
- Remove no longer needed patch (merged upstream).
- Adapt vnstat.mk to the new autotools-based build system.
- Include patch to improve gd library usability check + add configure option to explicitly disable that check.
---
Changes v1 -> v2:
- Fix typo in commit message (s/longed/longer/).
--- ...-fcntl.h-include-needed-by-open-closes-21.patch | 28 ------------ ...ure.ac-add-option-to-disable-image-output.patch | 51 ++++++++++++++++++++++ package/vnstat/vnstat.hash | 2 +- package/vnstat/vnstat.mk | 27 +++++------- 4 files changed, 64 insertions(+), 44 deletions(-) delete mode 100644 package/vnstat/0001-add-missing-fcntl.h-include-needed-by-open-closes-21.patch create mode 100644 package/vnstat/0001-configure.ac-add-option-to-disable-image-output.patch
package/vnstat/0001-add-missing-fcntl.h-include-needed-by-open-closes-21.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From a222434e096ce42c7937839f9666691f2b8a612f Mon Sep 17 00:00:00 2001 -From: Teemu Toivola <[email protected]> -Date: Sat, 27 Jun 2015 18:29:22 +0300 -Subject: [PATCH] add missing fcntl.h include needed by open(), closes #21 - -[Backport from upstream commit 964d7cd62b8626d51bf7ce06564aa9bd1d2b4d4c. -Fixes undeclared symbol issues when building with musl.] - -Signed-off-by: Rodrigo Rebello <[email protected]> ---- - src/common.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/common.h b/src/common.h -index 7616e55..eb0b61f 100644 ---- a/src/common.h -+++ b/src/common.h -@@ -22,6 +22,7 @@ - #include <pwd.h> - #include <grp.h> - #include <libgen.h> -+#include <fcntl.h> - - #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__FreeBSD_kernel__) - #include <sys/param.h> --- -2.1.4 -
package/vnstat/0001-configure.ac-add-option-to-disable-image-output.patch new file +51 -0
51 lines not on this page · raw message
package/vnstat/vnstat.hash +1 -1
@@ -1,2 +1,2 @@ # Locally calculated -sha256 f8462a47d85d0890493dc9eaeafbc725ae631aa5b103fb7f8af4ddb2314e8386 vnstat-1.14.tar.gz +sha256 c3814b5baa8b627198a8debfe1dce4b4346a342523818cc8668a5497971dbc39 vnstat-1.15.tar.gz
package/vnstat/vnstat.mk +12 -15
@@ -4,27 +4,24 @@ # ################################################################################ -VNSTAT_VERSION = 1.14 +VNSTAT_VERSION = 1.15 VNSTAT_SITE = http://humdi.net/vnstat VNSTAT_LICENSE = GPLv2 VNSTAT_LICENSE_FILES = COPYING +# We're patching configure.ac, so we need to autoreconf +VNSTAT_AUTORECONF = YES ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy) VNSTAT_DEPENDENCIES = gd -VNSTAT_GD_MAKE_OPT = all -define VNSTAT_INSTALL_VNSTATI_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/vnstati $(TARGET_DIR)/usr/bin/vnstati -endef +VNSTAT_CONF_OPTS = --enable-image-output +else +VNSTAT_CONF_OPTS = --disable-image-output endif -define VNSTAT_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(VNSTAT_GD_MAKE_OPT) -endef +# vnStat declares an 'install-data-hook' rule that tries to run +# 'vnstat --showconfig' on the host to generate a default config file. +# That obviously doesn't work when cross-compiling, so avoid it +# entirely. +VNSTAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec -define VNSTAT_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/vnstat $(TARGET_DIR)/usr/bin/vnstat - $(INSTALL) -D -m 0755 $(@D)/src/vnstatd $(TARGET_DIR)/usr/sbin/vnstatd - $(VNSTAT_INSTALL_VNSTATI_CMDS) -endef - -$(eval $(generic-package)) +$(eval $(autotools-package))
Signature · 1 line
2.1.4
Thomas Petazzoni
AppliedPATCH v2 1/1 vnstat: bump to version 1.15
Dear Rodrigo Rebello,
Quoted 11 lines · Rodrigo Rebello
Also:
- Remove no longer needed patch (merged upstream).
- Adapt vnstat.mk to the new autotools-based build system.
- Include patch to improve gd library usability check + add configure option to explicitly disable that check.Signed-off-by Rodrigo Rebello <[email protected]>---
Changes v1 -> v2:
- Fix typo in commit message (s/longed/longer/).
Quoted 8 lines
--- ...-fcntl.h-include-needed-by-open-closes-21.patch | 28 ------------ ...ure.ac-add-option-to-disable-image-output.patch | 51 ++++++++++++++++++++++ package/vnstat/vnstat.hash | 2 +- package/vnstat/vnstat.mk | 27 +++++------- 4 files changed, 64 insertions(+), 44 deletions(-) delete mode 100644 package/vnstat/0001-add-missing-fcntl.h-include-needed-by-open-closes-21.patch create mode 100644 package/vnstat/0001-configure.ac-add-option-to-disable-image-output.patch
Applied, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com