mirrors/openwrt
0
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-11-24 10:25:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

iproute2: Add lex/yacc files dependencies. Refresh other patches.

Browse Source 
SVN-Revision: 23027
This commit is contained in:
Michael Büsch 2010-09-12 11:05:55 +00:00
parent 393c83514b
commit 0c4abfba31
6 changed files with 80 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
package/iproute2/patches/000-debian_patches_3.patch
View File

@ -1,5 +1,17 @@
--- a/doc/ip-cref.tex
+++ b/doc/ip-cref.tex
---
Makefile | 4
doc/Makefile | 8
doc/ip-cref.tex | 16 +
include/linux/pkt_sched.h | 518 ++++++++++++++++++++++++++++++++++++++++++++++
ip/iptunnel.c | 2
misc/Makefile | 3
tc/Makefile | 1
tc/q_htb.c | 308 +++++++++++++++++++++++++++
tc/q_wrr.c | 322 ++++++++++++++++++++++++++++
9 files changed, 1177 insertions(+), 5 deletions(-)
--- iproute2-2.6.35.orig/doc/ip-cref.tex
+++ iproute2-2.6.35/doc/ip-cref.tex
@@ -1307,6 +1307,19 @@ peers are allowed to send to us.
--- \threeonly the clamp for congestion window. It is ignored if the \verb|lock|
flag is not used.
@ -20,18 +32,18 @@
\item \verb|advmss NUMBER|
@@ -2666,6 +2679,9 @@ http://www.cisco.com/univercd/cc/td/doc/
@@ -2664,6 +2677,9 @@ http://www.cisco.com/univercd/cc/td/doc/
\bibitem{RFC2414} M.~Allman, S.~Floyd, C.~Partridge.
``Increasing TCP's Initial Window'', RFC-2414.
+
+\bibitem{RFC2414} M.~Allman, S.~Floyd, C.~Partridge.
+``Increasing TCP's Initial Window'', RFC-2414.
+
\end{thebibliography}
--- a/doc/Makefile
+++ b/doc/Makefile
--- iproute2-2.6.35.orig/doc/Makefile
+++ iproute2-2.6.35/doc/Makefile
@@ -14,6 +14,7 @@ PAGESIZE=a4
PAGESPERPAGE=2
@ -63,8 +75,8 @@
clean:
- rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html
+ rm -f *.aux *.log *.toc $(PSFILES) $(DVIFILES) *.html $(TXTFILES)
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
--- iproute2-2.6.35.orig/include/linux/pkt_sched.h
+++ iproute2-2.6.35/include/linux/pkt_sched.h
@@ -1,3 +1,409 @@
+#if 0
+#ifndef __LINUX_PKT_SCHED_H
@ -475,7 +487,7 @@
#ifndef __LINUX_PKT_SCHED_H
#define __LINUX_PKT_SCHED_H
@@ -518,4 +924,116 @@ struct tc_drr_stats
@@ -481,4 +887,116 @@ struct tc_drr_stats {
__u32 deficit;
};
@ -592,9 +604,9 @@
+};
+
#endif
--- a/ip/iptunnel.c
+++ b/ip/iptunnel.c
@@ -129,7 +129,7 @@ static int parse_args(int argc, char **a
--- iproute2-2.6.35.orig/ip/iptunnel.c
+++ iproute2-2.6.35/ip/iptunnel.c
@@ -130,7 +130,7 @@ static int parse_args(int argc, char **a
NEXT_ARG();
p->o_flags |= GRE_KEY;
if (strchr(*argv, '.'))
@ -603,8 +615,8 @@
else {
if (get_unsigned(&uval, *argv, 0)<0) {
fprintf(stderr, "invalid value of \"okey\"\n");
--- a/Makefile
+++ b/Makefile
--- iproute2-2.6.35.orig/Makefile
+++ iproute2-2.6.35/Makefile
@@ -57,7 +57,7 @@ install: all
$(DESTDIR)$(DOCDIR)/examples
install -m 0644 $(shell find examples/diffserv -maxdepth 1 -type f) \
@ -623,8 +635,8 @@
do $(MAKE) $(MFLAGS) -C $$i clean; done
clobber: clean
--- a/misc/Makefile
+++ b/misc/Makefile
--- iproute2-2.6.35.orig/misc/Makefile
+++ iproute2-2.6.35/misc/Makefile
@@ -1,7 +1,8 @@
SSOBJ=ss.o ssfilter.o
LNSTATOBJ=lnstat.o lnstat_util.o
@ -635,8 +647,8 @@
include ../Config
--- a/tc/Makefile
+++ b/tc/Makefile
--- iproute2-2.6.35.orig/tc/Makefile
+++ iproute2-2.6.35/tc/Makefile
@@ -15,6 +15,7 @@ TCMODULES += q_cbq.o
TCMODULES += q_rr.o
TCMODULES += q_multiq.o
@ -645,8 +657,8 @@
TCMODULES += f_rsvp.o
TCMODULES += f_u32.o
TCMODULES += f_route.o
--- a/tc/q_htb.c
+++ b/tc/q_htb.c
--- iproute2-2.6.35.orig/tc/q_htb.c
+++ iproute2-2.6.35/tc/q_htb.c
@@ -1,3 +1,311 @@
+#if 0
+/*
@ -960,7 +972,7 @@
* q_htb.c HTB.
*
--- /dev/null
+++ b/tc/q_wrr.c
+++ iproute2-2.6.35/tc/q_wrr.c
@@ -0,0 +1,322 @@
+#include <stdio.h>
+#include <stdlib.h>

10
package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch
View File

@ -1,5 +1,9 @@
--- a/ip/ipxfrm.c
+++ b/ip/ipxfrm.c
---
ip/ipxfrm.c | 2 --
1 file changed, 2 deletions(-)
--- iproute2-2.6.35.orig/ip/ipxfrm.c
+++ iproute2-2.6.35/ip/ipxfrm.c
@@ -467,7 +467,6 @@ void xfrm_selector_print(struct xfrm_sel
switch (sel->proto) {
case IPPROTO_TCP:
@ -8,7 +12,7 @@
case IPPROTO_DCCP:
default: /* XXX */
if (sel->sport_mask)
@@ -1130,7 +1129,6 @@ static int xfrm_selector_upspec_parse(st
@@ -1172,7 +1171,6 @@ static int xfrm_selector_upspec_parse(st
switch (sel->proto) {
case IPPROTO_TCP:
case IPPROTO_UDP:

20
package/iproute2/patches/006-iproute2-tc_esfq.patch
View File

@ -1,5 +1,11 @@
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
---
include/linux/pkt_sched.h | 59 +++++++++++++
tc/Makefile | 1
tc/q_esfq.c | 200 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 260 insertions(+)
--- iproute2-2.6.35.orig/include/linux/pkt_sched.h
+++ iproute2-2.6.35/include/linux/pkt_sched.h
@@ -174,8 +174,38 @@ struct tc_sfq_qopt
*
* The only reason for this is efficiency, it is possible
@ -39,7 +45,7 @@
/* RED section */
enum
@@ -588,8 +618,37 @@ struct tc_sfq_xstats
@@ -579,8 +609,37 @@ struct tc_sfq_xstats {
*
* The only reason for this is efficiency, it is possible
* to change these parameters in compile time.
@ -76,9 +82,9 @@
+
/* RED section */
enum
--- a/tc/Makefile
+++ b/tc/Makefile
enum {
--- iproute2-2.6.35.orig/tc/Makefile
+++ iproute2-2.6.35/tc/Makefile
@@ -8,6 +8,7 @@ SHARED_LIBS ?= y
TCMODULES :=
TCMODULES += q_fifo.o
@ -88,7 +94,7 @@
TCMODULES += q_prio.o
TCMODULES += q_tbf.o
--- /dev/null
+++ b/tc/q_esfq.c
+++ iproute2-2.6.35/tc/q_esfq.c
@@ -0,0 +1,200 @@
+/*
+ * q_esfq.c ESFQ.

10
package/iproute2/patches/007-version_includes.patch
View File

@ -1,6 +1,10 @@
--- a/include/linux/netfilter_ipv4/ip_tables.h
+++ b/include/linux/netfilter_ipv4/ip_tables.h
@@ -114,7 +114,10 @@ struct ipt_entry
---
include/linux/netfilter_ipv4/ip_tables.h | 3 +++
1 file changed, 3 insertions(+)
--- iproute2-2.6.35.orig/include/linux/netfilter_ipv4/ip_tables.h
+++ iproute2-2.6.35/include/linux/netfilter_ipv4/ip_tables.h
@@ -113,7 +113,10 @@ struct ipt_entry {
#define IPT_CONTINUE XT_CONTINUE
#define IPT_RETURN XT_RETURN

11
package/iproute2/patches/050-bison_flex_makefile_deps_fix.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -95,6 +95,8 @@ MODDESTDIR := $(DESTDIR)$(patsubst /usr%
all: libtc.a tc $(TCSO)
+$(TCOBJ): emp_ematch.yacc.c emp_ematch.lex.c
+
tc: $(TCOBJ) $(LIBNETLINK) $(LIBUTIL) $(TCLIB)
libtc.a: $(TCLIB)

10
package/iproute2/patches/100-allow_pfifo_fast.patch
View File

@ -1,6 +1,10 @@
--- a/tc/q_fifo.c
+++ b/tc/q_fifo.c
@@ -94,5 +94,6 @@ struct qdisc_util pfifo_qdisc_util = {
---
tc/q_fifo.c | 1 +
1 file changed, 1 insertion(+)
--- iproute2-2.6.35.orig/tc/q_fifo.c
+++ iproute2-2.6.35/tc/q_fifo.c
@@ -98,5 +98,6 @@ struct qdisc_util pfifo_head_drop_qdisc_
extern int prio_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt);
struct qdisc_util pfifo_fast_qdisc_util = {
.id = "pfifo_fast",