From: Hauke Mehrtens Date: Wed, 30 Apr 2014 22:26:12 +0000 (+0000) Subject: mii-tool: update to 2014-02-18 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6bd044994944a71640ad6fa353d3a31a9816a99d;p=openwrt%2Fsvn-archive%2Fpackages.git mii-tool: update to 2014-02-18 Some notable changes: - #include sockios added upstream, drop patch - GbE support - Fix swapped advertising/link partner features fields - Document -p option - Dump more registers Full changelog: http://sourceforge.net/p/net-tools/code/ci/68a4d784daaf5fb3449808e434e8cbb9625988e6/log/?path=/mii-tool.c Signed-off-by: Catalin Patulea SVN-Revision: 40614 --- diff --git a/net/mii-tool/Makefile b/net/mii-tool/Makefile index ca63fb391..3e4c39511 100644 --- a/net/mii-tool/Makefile +++ b/net/mii-tool/Makefile @@ -8,12 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mii-tool -PKG_VERSION:=1.9.1.1 +PKG_VERSION:=2014-02-18 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://downloads.openwrt.org/sources -PKG_MD5SUM:=f65dbeb1c2392acffd4c94138b1f2e52 +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=git://git.code.sf.net/p/net-tools/code +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=68a4d784daaf5fb3449808e434e8cbb9625988e6 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz include $(INCLUDE_DIR)/package.mk @@ -31,7 +33,15 @@ define Package/mii-tool/description optimized for embedded systems and fully automated cross/-sysroot-builds endef -MAKE_FLAGS += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -I. -idirafter ./include/" +define Build/Configure + # Failed configure.sh leaves stub config.h around. + rm -f $(PKG_BUILD_DIR)/config.h + (cd $(PKG_BUILD_DIR) && yes $$$$'\n' | ./configure.sh config.in ) +endef + +define Build/Compile + $(call Build/Compile/Default,mii-tool) +endef define Package/mii-tool/install $(INSTALL_DIR) $(1)/usr/sbin diff --git a/net/mii-tool/patches/001-include_linux_sockios.patch b/net/mii-tool/patches/001-include_linux_sockios.patch deleted file mode 100644 index 3f11bf8ff..000000000 --- a/net/mii-tool/patches/001-include_linux_sockios.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: mii-tool-1.9.1.1/mii-tool.c -=================================================================== ---- mii-tool-1.9.1.1.orig/mii-tool.c -+++ mii-tool-1.9.1.1/mii-tool.c -@@ -50,6 +50,7 @@ static char version[] = - #include - #include - #endif -+#include - #include "mii.h" - - #define MAX_ETH 8 /* Maximum # of interfaces */