[oe-commits] org.oe.dev iproute2 2.6.18: Add verison 2.6.18 to pick up the new tc monitor command.

[lenehan commit]

iproute2 2.6.18: Add verison 2.6.18 to pick up the new tc monitor command.

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: 36e2aedf9d6e5ee346fbbc93271115a2c5536b11
ViewMTN: http://monotone.openembedded.org/revision.psp?id=36e2aedf9d6e5ee346fbbc93271115a2c5536b11
Files:
1
packages/iproute2/iproute2-2.6.18
packages/iproute2/iproute2-2.6.18/iproute2-2.6.15_no_strip.diff
packages/iproute2/iproute2-2.6.18/new-flex-fix.patch
packages/iproute2/iproute2_2.6.18.bb
Diffs:

#
# mt diff -r0ae515852fd8b3deee980fa70ad130d077bd79a0 -r36e2aedf9d6e5ee346fbbc93271115a2c5536b11
#
# 
# 
# add_dir "packages/iproute2/iproute2-2.6.18"
# 
# add_file "packages/iproute2/iproute2-2.6.18/iproute2-2.6.15_no_strip.diff"
#  content [e9a32b0b7bf17b09664db33f667ebb5e134e2bb2]
# 
# add_file "packages/iproute2/iproute2-2.6.18/new-flex-fix.patch"
#  content [b6331d83563ca2f60e83730f18d5b4d60b73b8f8]
# 
# add_file "packages/iproute2/iproute2_2.6.18.bb"
#  content [2ac55038b5f83236f924d4c8b4cf12e520297011]
# 
============================================================
--- packages/iproute2/iproute2-2.6.18/iproute2-2.6.15_no_strip.diff	e9a32b0b7bf17b09664db33f667ebb5e134e2bb2
+++ packages/iproute2/iproute2-2.6.18/iproute2-2.6.15_no_strip.diff	e9a32b0b7bf17b09664db33f667ebb5e134e2bb2
@@ -0,0 +1,25 @@
+--- ip/Makefile	2006/02/23 21:22:18	1.1
++++ ip/Makefile	2006/02/23 21:22:27
+@@ -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:
+--- tc/Makefile	2006/02/23 21:23:52	1.1
++++ tc/Makefile	2006/02/23 21:23:57
+@@ -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:
============================================================
--- packages/iproute2/iproute2-2.6.18/new-flex-fix.patch	b6331d83563ca2f60e83730f18d5b4d60b73b8f8
+++ packages/iproute2/iproute2-2.6.18/new-flex-fix.patch	b6331d83563ca2f60e83730f18d5b4d60b73b8f8
@@ -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.
+
+--- iproute2-2.6.16-060323/tc/emp_ematch.l	2006/10/30 22:46:29	1.1
++++ iproute2-2.6.16-060323/tc/emp_ematch.l	2006/10/30 22:47:26
+@@ -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;
============================================================
--- packages/iproute2/iproute2_2.6.18.bb	2ac55038b5f83236f924d4c8b4cf12e520297011
+++ packages/iproute2/iproute2_2.6.18.bb	2ac55038b5f83236f924d4c8b4cf12e520297011
@@ -0,0 +1,21 @@
+DESCRIPTION = "kernel routing and traffic control utilities"
+SECTION = "base"
+LICENSE = "GPL"
+DEPENDS = "flex-native bison-native"
+PR = "r0"
+
+DATE = "061002"
+SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz \
+           file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
+           file://new-flex-fix.patch;patch=1"
+
+S = "${WORKDIR}/${P}-${DATE}"
+
+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
+}
+
+FILES_${PN} += "/usr/lib/tc/*"
+FILES_${PN}-dbg += "/usr/lib/tc/.debug"