From 6001b3dcd29c6a6da363d9e13f0e12241e8648a4 Mon Sep 17 00:00:00 2001 From: "Alexandros C. Couloumbis" Date: Sun, 18 Jul 2010 07:55:41 +0000 Subject: [PATCH] net/ethtool: update to 2.6.34 SVN-Revision: 22271 --- net/ethtool/Makefile | 22 +++++- .../patches/01-ixp4xx_ethtool_autotools.patch | 77 ++++++++++--------- 2 files changed, 58 insertions(+), 41 deletions(-) diff --git a/net/ethtool/Makefile b/net/ethtool/Makefile index 4a87d60f6..c3bef426b 100644 --- a/net/ethtool/Makefile +++ b/net/ethtool/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ethtool -PKG_VERSION:=6 -PKG_RELEASE:=2 +PKG_VERSION:=2.6.34 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/gkernel -PKG_MD5SUM:=3b721ec27f17ebf320ba8c505cf66d9c +PKG_MD5SUM:=d3da60d661930147dd08a5e772c970e6 PKG_INSTALL:=1 @@ -30,6 +30,22 @@ define Package/ethtool/description ethtool is used for querying settings of an ethernet device and changing them. endef +define Build/Configure + (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ + ./autogen.sh \ + ); + $(call Build/Configure/Default, \ + ) +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) \ + SPECIAL_CFLAGS="-pthread $(TARGET_LDFLAGS)" + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + install +endef + define Package/ethtool/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ethtool $(1)/usr/sbin/ diff --git a/net/ethtool/patches/01-ixp4xx_ethtool_autotools.patch b/net/ethtool/patches/01-ixp4xx_ethtool_autotools.patch index 430d826ec..21a33de9f 100644 --- a/net/ethtool/patches/01-ixp4xx_ethtool_autotools.patch +++ b/net/ethtool/patches/01-ixp4xx_ethtool_autotools.patch @@ -1,73 +1,64 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -8,7 +8,7 @@ - amd8111e.c de2104x.c e100.c e1000.c \ - fec_8xx.c ibm_emac.c ixgb.c natsemi.c \ +@@ -8,7 +8,7 @@ ethtool_SOURCES = ethtool.c ethtool-copy + amd8111e.c de2104x.c e100.c e1000.c igb.c \ + fec_8xx.c ibm_emac.c ixgb.c ixgbe.c natsemi.c \ pcnet32.c realtek.c tg3.c marvell.c vioc.c \ -- smsc911x.c -+ smsc911x.c ixp4xx.c +- smsc911x.c at76c50x-usb.c ++ smsc911x.c at76c50x-usb.c ixp4xx.c dist-hook: cp $(top_srcdir)/ethtool.spec $(distdir) --- a/Makefile.in +++ b/Makefile.in -@@ -57,7 +57,7 @@ +@@ -55,7 +55,8 @@ am_ethtool_OBJECTS = ethtool.$(OBJEXT) a fec_8xx.$(OBJEXT) ibm_emac.$(OBJEXT) ixgb.$(OBJEXT) \ - natsemi.$(OBJEXT) pcnet32.$(OBJEXT) realtek.$(OBJEXT) \ - tg3.$(OBJEXT) marvell.$(OBJEXT) vioc.$(OBJEXT) \ -- smsc911x.$(OBJEXT) -+ smsc911x.$(OBJEXT) ixp4xx.$(OBJEXT) + ixgbe.$(OBJEXT) natsemi.$(OBJEXT) pcnet32.$(OBJEXT) \ + realtek.$(OBJEXT) tg3.$(OBJEXT) marvell.$(OBJEXT) \ +- vioc.$(OBJEXT) smsc911x.$(OBJEXT) at76c50x-usb.$(OBJEXT) ++ vioc.$(OBJEXT) smsc911x.$(OBJEXT) at76c50x-usb.$(OBJEXT) \ ++ ixp4xx.$(OBJEXT) ethtool_OBJECTS = $(am_ethtool_OBJECTS) ethtool_LDADD = $(LDADD) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -@@ -166,7 +166,7 @@ - amd8111e.c de2104x.c e100.c e1000.c \ - fec_8xx.c ibm_emac.c ixgb.c natsemi.c \ + DEFAULT_INCLUDES = -I.@am__isrc@ +@@ -198,7 +199,7 @@ ethtool_SOURCES = ethtool.c ethtool-copy + amd8111e.c de2104x.c e100.c e1000.c igb.c \ + fec_8xx.c ibm_emac.c ixgb.c ixgbe.c natsemi.c \ pcnet32.c realtek.c tg3.c marvell.c vioc.c \ -- smsc911x.c -+ smsc911x.c ixp4xx.c +- smsc911x.c at76c50x-usb.c ++ smsc911x.c at76c50x-usb.c ixp4xx.c all: ethtool-config.h $(MAKE) $(AM_MAKEFLAGS) all-am -@@ -266,6 +266,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fec_8xx.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ibm_emac.Po@am__quote@ +@@ -316,6 +317,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/igb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ixgb.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ixgbe.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ixp4xx.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/marvell.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/natsemi.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcnet32.Po@am__quote@ ---- a/ethtool-util.h -+++ b/ethtool-util.h -@@ -69,4 +69,7 @@ - /* SMSC LAN911x/LAN921x embedded ethernet controller */ - int smsc911x_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs); - -+/* Intel IXP4xx internal MAC */ -+int ixp4xx_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs); -+ - #endif --- a/ethtool.c +++ b/ethtool.c -@@ -1015,6 +1015,7 @@ - { "sky2", sky2_dump_regs }, - { "vioc", vioc_dump_regs }, - { "smsc911x", smsc911x_dump_regs }, +@@ -1324,6 +1324,7 @@ static struct { + { "igb", igb_dump_regs }, + { "ixgb", ixgb_dump_regs }, + { "ixgbe", ixgbe_dump_regs }, + { "ixp4xx_mac", ixp4xx_dump_regs }, - }; - - static int dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs) + { "natsemi", natsemi_dump_regs }, + { "e100", e100_dump_regs }, + { "amd8111e", amd8111e_dump_regs }, --- a/ethtool.spec +++ /dev/null @@ -1,42 +0,0 @@ -Name : ethtool --Version : 6 +-Version : 2.6.34 -Release : 1 -Group : Utilities - -Summary : A tool for setting ethernet parameters - --Copyright : GPL +-License : GPL -URL : http://sourceforge.net/projects/gkernel/ - -Buildroot : %{_tmppath}/%{name}-%{version} @@ -102,6 +93,16 @@ - - -%changelog +--- a/ethtool-util.h ++++ b/ethtool-util.h +@@ -69,4 +69,7 @@ + /* SMSC LAN911x/LAN921x embedded ethernet controller */ + int smsc911x_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs); + ++/* Intel IXP4xx internal MAC */ ++int ixp4xx_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs); ++ + #endif --- /dev/null +++ b/ixp4xx.c @@ -0,0 +1,131 @@ -- 2.30.2