diff options
Diffstat (limited to 'packages/iproute2')
| -rw-r--r-- | packages/iproute2/iproute2-2.6.20/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/iproute2/iproute2-2.6.20/ip6tunnel.patch | 10 | ||||
| -rw-r--r-- | packages/iproute2/iproute2-2.6.20/man-pages-fix.patch | 13 | ||||
| -rw-r--r-- | packages/iproute2/iproute2-2.6.20/new-flex-fix.patch | 83 | ||||
| -rw-r--r-- | packages/iproute2/iproute2-2.6.20/no-strip.patch | 36 | ||||
| -rw-r--r-- | packages/iproute2/iproute2.inc | 14 |
6 files changed, 153 insertions, 3 deletions
diff --git a/packages/iproute2/iproute2-2.6.20/.mtn2git_empty b/packages/iproute2/iproute2-2.6.20/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/iproute2/iproute2-2.6.20/.mtn2git_empty diff --git a/packages/iproute2/iproute2-2.6.20/ip6tunnel.patch b/packages/iproute2/iproute2-2.6.20/ip6tunnel.patch new file mode 100644 index 0000000000..371de01c16 --- /dev/null +++ b/packages/iproute2/iproute2-2.6.20/ip6tunnel.patch @@ -0,0 +1,10 @@ +--- iproute-2.6.20-070313/ip/ip6tunnel.c 2007/03/17 03:44:27 1.1 ++++ iproute-2.6.20-070313/ip/ip6tunnel.c 2007/03/17 03:43:14 +@@ -33,6 +33,7 @@ + #include <sys/socket.h> + #include <arpa/inet.h> + #include <sys/ioctl.h> ++#include <linux/types.h> + #include <linux/ip.h> + #include <linux/if.h> + #include <linux/if_arp.h> diff --git a/packages/iproute2/iproute2-2.6.20/man-pages-fix.patch b/packages/iproute2/iproute2-2.6.20/man-pages-fix.patch new file mode 100644 index 0000000000..924d0ed4dc --- /dev/null +++ b/packages/iproute2/iproute2-2.6.20/man-pages-fix.patch @@ -0,0 +1,13 @@ +--- iproute-2.6.20-070313/Makefile 2007/03/17 04:24:45 1.1 ++++ iproute-2.6.20-070313/Makefile 2007/03/17 04:27:39 +@@ -52,8 +52,8 @@ + install -m 0644 $(shell find etc/iproute2 -maxdepth 1 -type f) $(DESTDIR)$(CONFDIR) + install -m 0755 -d $(DESTDIR)$(MANDIR)/man8 + install -m 0644 $(shell find man/man8 -maxdepth 1 -type f) $(DESTDIR)$(MANDIR)/man8 +- ln -sf tc-pbfifo.8 $(DESTDIR)$(MANDIR)/man8/tc-bfifo.8 +- ln -sf tc-pbfifo.8 $(DESTDIR)$(MANDIR)/man8/tc-pfifo.8 ++ ln -sf tc-bfifo.8 $(DESTDIR)$(MANDIR)/man8/tc-pfifo.8 ++ ln -sf tc-bfifo.8 $(DESTDIR)$(MANDIR)/man8/tc-pbfifo.8 + install -m 0755 -d $(DESTDIR)$(MANDIR)/man3 + install -m 0644 $(shell find man/man3 -maxdepth 1 -type f) $(DESTDIR)$(MANDIR)/man3 + diff --git a/packages/iproute2/iproute2-2.6.20/new-flex-fix.patch b/packages/iproute2/iproute2-2.6.20/new-flex-fix.patch new file mode 100644 index 0000000000..af7272163e --- /dev/null +++ b/packages/iproute2/iproute2-2.6.20/new-flex-fix.patch @@ -0,0 +1,83 @@ +The tc command was failing to build due to flex errors. These errors are +caused by an incompatible change to flex in recent versions, including the +version shipped with OE. + +This fix is as per the one used by opensure: + + http://lists.opensuse.org/opensuse-commit/2006-04/msg00090.html + +and simple renames str to prevent it conflicting. + +--- iproute-2.6.20-070313/tc/emp_ematch.l 2007/03/17 02:52:20 1.1 ++++ iproute-2.6.20-070313/tc/emp_ematch.l 2007/03/17 02:54:01 +@@ -63,7 +63,7 @@ + + %} + +-%x str ++%x STR + + %option 8bit stack warn noyywrap prefix="ematch_" + %% +@@ -78,17 +78,17 @@ + } + strbuf_index = 0; + +- BEGIN(str); ++ BEGIN(STR); + } + +-<str>\" { ++<STR>\" { + BEGIN(INITIAL); + yylval.b = bstr_new(strbuf, strbuf_index); + yylval.b->quoted = 1; + return ATTRIBUTE; + } + +-<str>\\[0-7]{1,3} { /* octal escape sequence */ ++<STR>\\[0-7]{1,3} { /* octal escape sequence */ + int res; + + sscanf(yytext + 1, "%o", &res); +@@ -100,12 +100,12 @@ + strbuf_append_char((unsigned char) res); + } + +-<str>\\[0-9]+ { /* catch wrong octal escape seq. */ ++<STR>\\[0-9]+ { /* catch wrong octal escape seq. */ + fprintf(stderr, "error: invalid octale escape sequence\n"); + return ERROR; + } + +-<str>\\x[0-9a-fA-F]{1,2} { ++<STR>\\x[0-9a-fA-F]{1,2} { + int res; + + sscanf(yytext + 2, "%x", &res); +@@ -118,16 +118,16 @@ + strbuf_append_char((unsigned char) res); + } + +-<str>\\n strbuf_append_char('\n'); +-<str>\\r strbuf_append_char('\r'); +-<str>\\t strbuf_append_char('\t'); +-<str>\\v strbuf_append_char('\v'); +-<str>\\b strbuf_append_char('\b'); +-<str>\\f strbuf_append_char('\f'); +-<str>\\a strbuf_append_char('\a'); ++<STR>\\n strbuf_append_char('\n'); ++<STR>\\r strbuf_append_char('\r'); ++<STR>\\t strbuf_append_char('\t'); ++<STR>\\v strbuf_append_char('\v'); ++<STR>\\b strbuf_append_char('\b'); ++<STR>\\f strbuf_append_char('\f'); ++<STR>\\a strbuf_append_char('\a'); + +-<str>\\(.|\n) strbuf_append_char(yytext[1]); +-<str>[^\\\n\"]+ strbuf_append_charp(yytext); ++<STR>\\(.|\n) strbuf_append_char(yytext[1]); ++<STR>[^\\\n\"]+ strbuf_append_charp(yytext); + + [aA][nN][dD] return AND; + [oO][rR] return OR; diff --git a/packages/iproute2/iproute2-2.6.20/no-strip.patch b/packages/iproute2/iproute2-2.6.20/no-strip.patch new file mode 100644 index 0000000000..6490dadb07 --- /dev/null +++ b/packages/iproute2/iproute2-2.6.20/no-strip.patch @@ -0,0 +1,36 @@ +--- iproute-2.6.20-070313/ip/Makefile 2007/03/17 05:17:30 1.1 ++++ iproute-2.6.20-070313/ip/Makefile 2007/03/17 05:17:37 +@@ -16,7 +16,7 @@ + rtmon: $(RTMONOBJ) $(LIBNETLINK) + + install: all +- install -m 0755 -s $(TARGETS) $(DESTDIR)$(SBINDIR) ++ install -m 0755 $(TARGETS) $(DESTDIR)$(SBINDIR) + install -m 0755 $(SCRIPTS) $(DESTDIR)$(SBINDIR) + + clean: +--- iproute-2.6.20-070313/misc/Makefile 2007/03/17 05:18:20 1.1 ++++ iproute-2.6.20-070313/misc/Makefile 2007/03/17 05:18:26 +@@ -27,7 +27,7 @@ + lnstat: $(LNSTATOBJ) + + install: all +- install -m 0755 -s $(TARGETS) $(DESTDIR)$(SBINDIR) ++ install -m 0755 $(TARGETS) $(DESTDIR)$(SBINDIR) + ln -sf lnstat $(DESTDIR)$(SBINDIR)/rtstat + ln -sf lnstat $(DESTDIR)$(SBINDIR)/ctstat + +--- iproute-2.6.20-070313/tc/Makefile 2007/03/17 05:17:42 1.1 ++++ iproute-2.6.20-070313/tc/Makefile 2007/03/17 05:17:54 +@@ -70,9 +70,9 @@ + + install: all + mkdir -p $(DESTDIR)/usr/lib/tc +- install -m 0755 -s tc $(DESTDIR)$(SBINDIR) ++ install -m 0755 tc $(DESTDIR)$(SBINDIR) + for i in $(TCSO); \ +- do install -m 755 -s $$i $(DESTDIR)/usr/lib/tc; \ ++ do install -m 755 $$i $(DESTDIR)/usr/lib/tc; \ + done + + clean: diff --git a/packages/iproute2/iproute2.inc b/packages/iproute2/iproute2.inc index 006b27b60f..e14bfdeefe 100644 --- a/packages/iproute2/iproute2.inc +++ b/packages/iproute2/iproute2.inc @@ -3,12 +3,20 @@ SECTION = "base" LICENSE = "GPL" DEPENDS = "flex-native bison-native" -# Set DATE in the .bb file +# This changed from iproute2 to iproute with version 2.6.20, so set to +# iproute in the recipe for 2.6.20 and newer versions. +DIRNAME ?= "${PN}" + +# Set the DATE in the .bb file SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz" -S = "${WORKDIR}/${P}-${DATE}" +S = "${WORKDIR}/${DIRNAME}-${PV}-${DATE}" -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR=/sbin" +EXTRA_OEMAKE = "CC='${CC}' \ + KERNEL_INCLUDE=${STAGING_KERNEL_DIR}/include \ + DOCDIR=${docdir}/iproute2 \ + SUBDIRS='lib tc ip' \ + SBINDIR=/sbin" do_install () { oe_runmake DESTDIR=${D} install |