upgrade wireless-tools and iproute2

SVN-Revision: 1084
This commit is contained in:
Imre Kaloz 2005-05-27 17:32:43 +00:00
parent ab9c9b1298
commit ca55f8d3da
6 changed files with 546 additions and 627 deletions

View file

@ -3,13 +3,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=iproute2 PKG_NAME:=iproute2
PKG_VERSION:=2.6.9 PKG_VERSION:=2.6.11-050330
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MD5SUM:=4b3f335b0139cb909c6a2ae8bf72e548 PKG_MD5SUM:=e705f26b5ae93e0332e46a3ff15d934
PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/ PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/
PKG_SOURCE:=$(PKG_NAME)-2.6.9-041019.tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-2.6.9 PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION)
PKG_CAT:=zcat PKG_CAT:=zcat
include $(TOPDIR)/package/rules.mk include $(TOPDIR)/package/rules.mk
@ -30,6 +30,7 @@ $(PKG_BUILD_DIR)/.configured:
touch $@ touch $@
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.built:
$(MAKE) -j1 -C $(PKG_BUILD_DIR)/netem HOSTCC=$(HOSTCC) CFLAGS="-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -I ../include -DRESOLVE_HOSTNAMES"
$(MAKE) -j1 -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) KERNEL_INCLUDE=$(LINUX_DIR)/include all tc/tc ip/ip $(MAKE) -j1 -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) KERNEL_INCLUDE=$(LINUX_DIR)/include all tc/tc ip/ip
touch $@ touch $@

View file

@ -1,6 +1,7 @@
--- iproute2-2.6.9.old/ip/ipxfrm.c 2005-01-30 19:09:32.000000000 +0100 diff -Nur iproute2-2.6.11-050330/ip/ipxfrm.c iproute2-2.6.11-050330.new/ip/ipxfrm.c
+++ iproute2-2.6.9/ip/ipxfrm.c 2005-01-30 19:10:31.000000000 +0100 --- iproute2-2.6.11-050330/ip/ipxfrm.c 2005-04-01 21:58:11.000000000 +0200
@@ -392,7 +392,6 @@ +++ iproute2-2.6.11-050330.new/ip/ipxfrm.c 2005-05-27 12:27:44.000000000 +0200
@@ -444,7 +444,6 @@
switch (sel->proto) { switch (sel->proto) {
case IPPROTO_TCP: case IPPROTO_TCP:
case IPPROTO_UDP: case IPPROTO_UDP:
@ -8,7 +9,7 @@
default: /* XXX */ default: /* XXX */
if (sel->sport_mask) if (sel->sport_mask)
fprintf(fp, "sport %u ", ntohs(sel->sport)); fprintf(fp, "sport %u ", ntohs(sel->sport));
@@ -787,7 +786,6 @@ @@ -998,7 +997,6 @@
switch (sel->proto) { switch (sel->proto) {
case IPPROTO_TCP: case IPPROTO_TCP:
case IPPROTO_UDP: case IPPROTO_UDP:

View file

@ -1,11 +0,0 @@
--- iproute-2.6.9.old/tc/Makefile 2005-01-30 18:53:59.000000000 +0100
+++ iproute-2.6.9/tc/Makefile 2005-01-30 18:54:07.000000000 +0100
@@ -52,7 +52,7 @@
./$* >$@
rm $*
-all: libtc.a tc $(TCSO) $(NETEM_DIST)
+all: libtc.a tc $(TCSO)
tc: $(TCOBJ) $(LIBNETLINK) $(LIBUTIL) $(TCLIB)

View file

@ -3,9 +3,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=wireless-tools PKG_NAME:=wireless-tools
PKG_VERSION:=28.pre6 PKG_VERSION:=28.pre7
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MD5SUM:=3ad1da3b17dff963eba32f0b79401253 PKG_MD5SUM:=bf598d6ded79e9e6b9bc2dbeb8258f48
PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
PKG_SOURCE:=wireless_tools.$(PKG_VERSION).tar.gz PKG_SOURCE:=wireless_tools.$(PKG_VERSION).tar.gz