[oe-commits] org.oe.dev iproute2: Add latest version 2.6.22. Also move the settings of S into the
lenehan commit
openembedded-commits at lists.openembedded.org
Sat Aug 18 08:50:50 UTC 2007
iproute2: Add latest version 2.6.22. Also move the settings of S into the
individual .bb files since it has changed again in this release.
Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: ef324c40427e7ab7b12ab5bea06ddce4882d6bad
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ef324c40427e7ab7b12ab5bea06ddce4882d6bad
Files:
1
packages/iproute2/iproute2-2.6.22
packages/iproute2/iproute2-2.6.22/new-flex-fix.patch
packages/iproute2/iproute2-2.6.22/no-strip.patch
packages/iproute2/iproute2_2.6.22.bb
packages/iproute2/iproute2.inc
packages/iproute2/iproute2_2.6.16.bb
packages/iproute2/iproute2_2.6.18.bb
packages/iproute2/iproute2_2.6.20.bb
Diffs:
#
# mt diff -rd0c22ec661b0217b734a75f0ab5ef2e3ba784036 -ref324c40427e7ab7b12ab5bea06ddce4882d6bad
#
#
#
# add_dir "packages/iproute2/iproute2-2.6.22"
#
# add_file "packages/iproute2/iproute2-2.6.22/new-flex-fix.patch"
# content [2852a92603642d0a86db0071a69c7d7d718df9d0]
#
# add_file "packages/iproute2/iproute2-2.6.22/no-strip.patch"
# content [6cd22f05022df1f1c5b46e1959d2daae3e7cfb62]
#
# add_file "packages/iproute2/iproute2_2.6.22.bb"
# content [d07467bb335253be619a574234d3ac5d9bba3cf4]
#
# patch "packages/iproute2/iproute2.inc"
# from [8ced56f6a6b7b1b35bc1eac1f631ae11a91617e0]
# to [fd345dd57f1584cddb0bf37fb78ebdc3cc7f79c5]
#
# patch "packages/iproute2/iproute2_2.6.16.bb"
# from [d7129a2d48dca39c3cf69ba3382297249a83b45e]
# to [c08dcd6a0d10333e008857685474409b61ea53af]
#
# patch "packages/iproute2/iproute2_2.6.18.bb"
# from [ed105c98db7cbc002aa5185aac193dd86b7f6b89]
# to [de61bbd99de524961f5a3d17baf23027a0e96e1a]
#
# patch "packages/iproute2/iproute2_2.6.20.bb"
# from [1645f0e483e54de590c831fb8a46a0c999c4b0c9]
# to [77cb5ddd5dc68c4440577a201f110c7c589eeac1]
#
============================================================
--- packages/iproute2/iproute2-2.6.22/new-flex-fix.patch 2852a92603642d0a86db0071a69c7d7d718df9d0
+++ packages/iproute2/iproute2-2.6.22/new-flex-fix.patch 2852a92603642d0a86db0071a69c7d7d718df9d0
@@ -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;
============================================================
--- packages/iproute2/iproute2-2.6.22/no-strip.patch 6cd22f05022df1f1c5b46e1959d2daae3e7cfb62
+++ packages/iproute2/iproute2-2.6.22/no-strip.patch 6cd22f05022df1f1c5b46e1959d2daae3e7cfb62
@@ -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:
============================================================
--- packages/iproute2/iproute2_2.6.22.bb d07467bb335253be619a574234d3ac5d9bba3cf4
+++ packages/iproute2/iproute2_2.6.22.bb d07467bb335253be619a574234d3ac5d9bba3cf4
@@ -0,0 +1,10 @@
+PR = "r0"
+
+DATE = "070710"
+
+SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
+ file://no-strip.patch;patch=1"
+
+S = "${WORKDIR}"
+
+require iproute2.inc
============================================================
--- packages/iproute2/iproute2.inc 8ced56f6a6b7b1b35bc1eac1f631ae11a91617e0
+++ packages/iproute2/iproute2.inc fd345dd57f1584cddb0bf37fb78ebdc3cc7f79c5
@@ -1,16 +1,13 @@ DESCRIPTION = "kernel routing and traffi
DESCRIPTION = "kernel routing and traffic control utilities"
+HOMEPAGE = "http://linux-net.osdl.org/index.php/Iproute2"
SECTION = "base"
LICENSE = "GPL"
DEPENDS = "flex-native bison-native"
-# 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}/${DIRNAME}-${PV}-${DATE}"
+# Set S in the .bb files
inherit update-alternatives
============================================================
--- packages/iproute2/iproute2_2.6.16.bb d7129a2d48dca39c3cf69ba3382297249a83b45e
+++ packages/iproute2/iproute2_2.6.16.bb c08dcd6a0d10333e008857685474409b61ea53af
@@ -1,8 +1,10 @@ PR = "r3"
PR = "r3"
+DATE = "060323"
+
SRC_URI_append = " file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
file://new-flex-fix.patch;patch=1"
-require iproute2.inc
+S = "${WORKDIR}/iproute2-${PV}-${DATE}"
+require iproute2.inc
-DATE = "060323"
============================================================
--- packages/iproute2/iproute2_2.6.18.bb ed105c98db7cbc002aa5185aac193dd86b7f6b89
+++ packages/iproute2/iproute2_2.6.18.bb de61bbd99de524961f5a3d17baf23027a0e96e1a
@@ -1,8 +1,10 @@ PR = "r2"
PR = "r2"
+DATE = "061002"
+
SRC_URI_append = " file://iproute2-2.6.15_no_strip.diff;patch=1;pnum=0 \
file://new-flex-fix.patch;patch=1"
-require iproute2.inc
+S = "${WORKDIR}/iproute2-${PV}-${DATE}"
+require iproute2.inc
-DATE = "061002"
============================================================
--- packages/iproute2/iproute2_2.6.20.bb 1645f0e483e54de590c831fb8a46a0c999c4b0c9
+++ packages/iproute2/iproute2_2.6.20.bb 77cb5ddd5dc68c4440577a201f110c7c589eeac1
@@ -1,11 +1,12 @@ PR = "r2"
PR = "r2"
+DATE = "070313"
+
SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
file://ip6tunnel.patch;patch=1 \
file://man-pages-fix.patch;patch=1 \
file://no-strip.patch;patch=1"
-require iproute2.inc
+S = "${WORKDIR}/iproute-${PV}-${DATE}"
+require iproute2.inc
-DIRNAME = "iproute"
-DATE = "070313"
More information about the Openembedded-commits
mailing list