From f3d2ad4fb1262dc95916d9362e14d36daa0c537c Mon Sep 17 00:00:00 2001 From: Richard Purdie 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 ---------------------- meta-extras/packages/iproute2/iproute2.inc | 18 ----- meta-extras/packages/iproute2/iproute2_2.6.18.bb | 8 --- .../iproute2-2.6.18/iproute2-2.6.15_no_strip.diff | 25 +++++++ .../iproute2/iproute2-2.6.18/new-flex-fix.patch | 83 ++++++++++++++++++++++ meta/packages/iproute2/iproute2.inc | 18 +++++ meta/packages/iproute2/iproute2_2.6.18.bb | 8 +++ 8 files changed, 134 insertions(+), 134 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 delete mode 100644 meta-extras/packages/iproute2/iproute2.inc delete mode 100644 meta-extras/packages/iproute2/iproute2_2.6.18.bb create mode 100644 meta/packages/iproute2/iproute2-2.6.18/iproute2-2.6.15_no_strip.diff create mode 100644 meta/packages/iproute2/iproute2-2.6.18/new-flex-fix.patch create mode 100644 meta/packages/iproute2/iproute2.inc create mode 100644 meta/packages/iproute2/iproute2_2.6.18.bb 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); - } - --\" { -+\" { - BEGIN(INITIAL); - yylval.b = bstr_new(strbuf, strbuf_index); - yylval.b->quoted = 1; - return ATTRIBUTE; - } - --\\[0-7]{1,3} { /* octal escape sequence */ -+\\[0-7]{1,3} { /* octal escape sequence */ - int res; - - sscanf(yytext + 1, "%o", &res); -@@ -100,12 +100,12 @@ - strbuf_append_char((unsigned char) res); - } - --\\[0-9]+ { /* catch wrong octal escape seq. */ -+\\[0-9]+ { /* catch wrong octal escape seq. */ - fprintf(stderr, "error: invalid octale escape sequence\n"); - return ERROR; - } - --\\x[0-9a-fA-F]{1,2} { -+\\x[0-9a-fA-F]{1,2} { - int res; - - sscanf(yytext + 2, "%x", &res); -@@ -118,16 +118,16 @@ - strbuf_append_char((unsigned char) res); - } - --\\n strbuf_append_char('\n'); --\\r strbuf_append_char('\r'); --\\t strbuf_append_char('\t'); --\\v strbuf_append_char('\v'); --\\b strbuf_append_char('\b'); --\\f strbuf_append_char('\f'); --\\a strbuf_append_char('\a'); -+\\n strbuf_append_char('\n'); -+\\r strbuf_append_char('\r'); -+\\t strbuf_append_char('\t'); -+\\v strbuf_append_char('\v'); -+\\b strbuf_append_char('\b'); -+\\f strbuf_append_char('\f'); -+\\a strbuf_append_char('\a'); - --\\(.|\n) strbuf_append_char(yytext[1]); --[^\\\n\"]+ strbuf_append_charp(yytext); -+\\(.|\n) strbuf_append_char(yytext[1]); -+[^\\\n\"]+ strbuf_append_charp(yytext); - - [aA][nN][dD] return AND; - [oO][rR] return OR; diff --git a/meta-extras/packages/iproute2/iproute2.inc b/meta-extras/packages/iproute2/iproute2.inc deleted file mode 100644 index 006b27b60..000000000 --- a/meta-extras/packages/iproute2/iproute2.inc +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "kernel routing and traffic control utilities" -SECTION = "base" -LICENSE = "GPL" -DEPENDS = "flex-native bison-native" - -# Set DATE in the .bb file -SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz" - -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" diff --git a/meta-extras/packages/iproute2/iproute2_2.6.18.bb b/meta-extras/packages/iproute2/iproute2_2.6.18.bb deleted file mode 100644 index 72eb39d69..000000000 --- a/meta-extras/packages/iproute2/iproute2_2.6.18.bb +++ /dev/null @@ -1,8 +0,0 @@ -PR = "r1" - -require iproute2.inc - -SRC_URI += "file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \ - file://new-flex-fix.patch;patch=1" - -DATE = "061002" diff --git a/meta/packages/iproute2/iproute2-2.6.18/iproute2-2.6.15_no_strip.diff b/meta/packages/iproute2/iproute2-2.6.18/iproute2-2.6.15_no_strip.diff new file mode 100644 index 000000000..496506960 --- /dev/null +++ b/meta/packages/iproute2/iproute2-2.6.18/iproute2-2.6.15_no_strip.diff @@ -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: diff --git a/meta/packages/iproute2/iproute2-2.6.18/new-flex-fix.patch b/meta/packages/iproute2/iproute2-2.6.18/new-flex-fix.patch new file mode 100644 index 000000000..2c0408783 --- /dev/null +++ b/meta/packages/iproute2/iproute2-2.6.18/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. + +--- 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); + } + +-\" { ++\" { + BEGIN(INITIAL); + yylval.b = bstr_new(strbuf, strbuf_index); + yylval.b->quoted = 1; + return ATTRIBUTE; + } + +-\\[0-7]{1,3} { /* octal escape sequence */ ++\\[0-7]{1,3} { /* octal escape sequence */ + int res; + + sscanf(yytext + 1, "%o", &res); +@@ -100,12 +100,12 @@ + strbuf_append_char((unsigned char) res); + } + +-\\[0-9]+ { /* catch wrong octal escape seq. */ ++\\[0-9]+ { /* catch wrong octal escape seq. */ + fprintf(stderr, "error: invalid octale escape sequence\n"); + return ERROR; + } + +-\\x[0-9a-fA-F]{1,2} { ++\\x[0-9a-fA-F]{1,2} { + int res; + + sscanf(yytext + 2, "%x", &res); +@@ -118,16 +118,16 @@ + strbuf_append_char((unsigned char) res); + } + +-\\n strbuf_append_char('\n'); +-\\r strbuf_append_char('\r'); +-\\t strbuf_append_char('\t'); +-\\v strbuf_append_char('\v'); +-\\b strbuf_append_char('\b'); +-\\f strbuf_append_char('\f'); +-\\a strbuf_append_char('\a'); ++\\n strbuf_append_char('\n'); ++\\r strbuf_append_char('\r'); ++\\t strbuf_append_char('\t'); ++\\v strbuf_append_char('\v'); ++\\b strbuf_append_char('\b'); ++\\f strbuf_append_char('\f'); ++\\a strbuf_append_char('\a'); + +-\\(.|\n) strbuf_append_char(yytext[1]); +-[^\\\n\"]+ strbuf_append_charp(yytext); ++\\(.|\n) strbuf_append_char(yytext[1]); ++[^\\\n\"]+ strbuf_append_charp(yytext); + + [aA][nN][dD] return AND; + [oO][rR] return OR; diff --git a/meta/packages/iproute2/iproute2.inc b/meta/packages/iproute2/iproute2.inc new file mode 100644 index 000000000..006b27b60 --- /dev/null +++ b/meta/packages/iproute2/iproute2.inc @@ -0,0 +1,18 @@ +DESCRIPTION = "kernel routing and traffic control utilities" +SECTION = "base" +LICENSE = "GPL" +DEPENDS = "flex-native bison-native" + +# Set DATE in the .bb file +SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz" + +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" diff --git a/meta/packages/iproute2/iproute2_2.6.18.bb b/meta/packages/iproute2/iproute2_2.6.18.bb new file mode 100644 index 000000000..72eb39d69 --- /dev/null +++ b/meta/packages/iproute2/iproute2_2.6.18.bb @@ -0,0 +1,8 @@ +PR = "r1" + +require iproute2.inc + +SRC_URI += "file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \ + file://new-flex-fix.patch;patch=1" + +DATE = "061002" -- cgit v1.2.3