From f3d2ad4fb1262dc95916d9362e14d36daa0c537c Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Thu, 7 Feb 2008 22:15:48 +0000
Subject: iproute2: Move from meta-extras to meta

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3717 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../iproute2-2.6.18/iproute2-2.6.15_no_strip.diff  | 25 -------
 .../iproute2/iproute2-2.6.18/new-flex-fix.patch    | 83 ----------------------
 2 files changed, 108 deletions(-)
 delete mode 100644 meta-extras/packages/iproute2/iproute2-2.6.18/iproute2-2.6.15_no_strip.diff
 delete mode 100644 meta-extras/packages/iproute2/iproute2-2.6.18/new-flex-fix.patch

(limited to 'meta-extras/packages/iproute2/iproute2-2.6.18')

diff --git a/meta-extras/packages/iproute2/iproute2-2.6.18/iproute2-2.6.15_no_strip.diff b/meta-extras/packages/iproute2/iproute2-2.6.18/iproute2-2.6.15_no_strip.diff
deleted file mode 100644
index 496506960..000000000
--- a/meta-extras/packages/iproute2/iproute2-2.6.18/iproute2-2.6.15_no_strip.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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:
diff --git a/meta-extras/packages/iproute2/iproute2-2.6.18/new-flex-fix.patch b/meta-extras/packages/iproute2/iproute2-2.6.18/new-flex-fix.patch
deleted file mode 100644
index 2c0408783..000000000
--- a/meta-extras/packages/iproute2/iproute2-2.6.18/new-flex-fix.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-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;
-- 
cgit v1.2.3