From f2ad3267304a906c2fd2ccddf4145acd786263be Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Thu, 18 Aug 2016 14:26:29 +0300 Subject: [PATCH 1/2] tcpreplay: disable libnl3 and libdbus-1 check in CONFIGURE_VARS Also, drop patch that disables libdbus-1 check in configure script. Signed-off-by: Alexandru Ardelean --- net/tcpreplay/Makefile | 6 ++++++ net/tcpreplay/patches/001-disable-dbus-link.patch | 12 ------------ 2 files changed, 6 insertions(+), 12 deletions(-) delete mode 100644 net/tcpreplay/patches/001-disable-dbus-link.patch diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile index 627abc5fd..bdc90aab7 100644 --- a/net/tcpreplay/Makefile +++ b/net/tcpreplay/Makefile @@ -124,6 +124,12 @@ define Package/tcpreplay-all/description to support switches, routers, and IP Flow/NetFlow appliances. endef +CONFIGURE_VARS += \ + ac_cv_lib_nl_nl_cache_alloc=no \ + ac_cv_lib_nl_genl_3_genl_connect=no \ + ac_cv_lib_nl_3_nl_cache_alloc=no \ + ac_cv_lib_dbus_1_dbus_malloc=no + CONFIGURE_ARGS += \ --enable-force-pf \ --enable-dynamic-link \ diff --git a/net/tcpreplay/patches/001-disable-dbus-link.patch b/net/tcpreplay/patches/001-disable-dbus-link.patch deleted file mode 100644 index 6f34e9fc8..000000000 --- a/net/tcpreplay/patches/001-disable-dbus-link.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 6c61381..7f72871 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -773,7 +773,6 @@ if ! test $using_pcap_config = yes; then - AC_CHECK_LIB(nl, nl_cache_alloc, [nl_found=yes]) - AC_CHECK_LIB(nl-genl-3, genl_connect, [nl_genl_3_found=yes]) - AC_CHECK_LIB(nl-3, nl_cache_alloc, [nl_3_found=yes]) -- AC_CHECK_LIB(dbus-1, dbus_malloc, [dbus_1_found=yes]) - if test "$nl_found" = "yes"; then - LPCAPLIB="$LPCAPLIB -lnl" - fi From f655a0dd01385c9b68648ce15d6578d9532e3953 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Thu, 18 Aug 2016 14:30:17 +0300 Subject: [PATCH 2/2] tcpreplay: add PKG_LICENSE_FILES Signed-off-by: Alexandru Ardelean --- net/tcpreplay/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile index bdc90aab7..6ff222502 100644 --- a/net/tcpreplay/Makefile +++ b/net/tcpreplay/Makefile @@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tcpreplay PKG_VERSION:=4.1.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/appneta/tcpreplay/releases/download/v$(PKG_VERSION) PKG_MD5SUM:=80394c33fe697b53b69eac9bb0968ae9 PKG_LICENSE:=GPL-3.0 +PKG_LICENSE_FILES:=docs/LICENSE PKG_FIXUP:=libtool PKG_INSTALL:=1