summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2010-05-21 19:25:45 +0200
committerRobert Schwebel <r.schwebel@pengutronix.de>2010-05-25 12:45:10 +0200
commit2afd11259c199d223e94d257729eea89e933d0b3 (patch)
tree0743a732ab23b544d3650ccbcdfb620d6d38ae32 /patches
parent4624ce47c804e4c84e8490dd91bf7842875483ed (diff)
downloadptxdist-2afd11259c199d223e94d257729eea89e933d0b3.tar.gz
ptxdist-2afd11259c199d223e94d257729eea89e933d0b3.tar.xz
[iproute2] version bump 2.6.31 -> 2.6.34
While being there, fix the installation of tc (which was a dummy recently). Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/iproute2-2.6.34/0001-remove-duplicate-limits.h.patch (renamed from patches/iproute2-2.6.31/0001-remove-duplicate-limits.h.patch)0
-rw-r--r--patches/iproute2-2.6.34/0002-remove_arpd.diff (renamed from patches/iproute2-2.6.31/0002-remove_arpd.diff)0
-rw-r--r--patches/iproute2-2.6.34/0003-install-tc.diff22
-rw-r--r--patches/iproute2-2.6.34/series (renamed from patches/iproute2-2.6.31/series)1
4 files changed, 23 insertions, 0 deletions
diff --git a/patches/iproute2-2.6.31/0001-remove-duplicate-limits.h.patch b/patches/iproute2-2.6.34/0001-remove-duplicate-limits.h.patch
index b98620360..b98620360 100644
--- a/patches/iproute2-2.6.31/0001-remove-duplicate-limits.h.patch
+++ b/patches/iproute2-2.6.34/0001-remove-duplicate-limits.h.patch
diff --git a/patches/iproute2-2.6.31/0002-remove_arpd.diff b/patches/iproute2-2.6.34/0002-remove_arpd.diff
index ce791d942..ce791d942 100644
--- a/patches/iproute2-2.6.31/0002-remove_arpd.diff
+++ b/patches/iproute2-2.6.34/0002-remove_arpd.diff
diff --git a/patches/iproute2-2.6.34/0003-install-tc.diff b/patches/iproute2-2.6.34/0003-install-tc.diff
new file mode 100644
index 000000000..6a80910ff
--- /dev/null
+++ b/patches/iproute2-2.6.34/0003-install-tc.diff
@@ -0,0 +1,22 @@
+---
+ tc/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+Index: iproute2-2.6.34/tc/Makefile
+===================================================================
+--- iproute2-2.6.34.orig/tc/Makefile
++++ iproute2-2.6.34/tc/Makefile
+@@ -99,10 +99,10 @@ libtc.a: $(TCLIB)
+ $(AR) rcs $@ $(TCLIB)
+
+ install: all
+- echo mkdir -p $(MODDESTDIR)
+- echo install -m 0755 tc $(DESTDIR)$(SBINDIR)
++ mkdir -p $(MODDESTDIR)
++ install -m 0755 tc $(DESTDIR)$(SBINDIR)
+ for i in $(TCSO); \
+- do echo install -m 755 $$i $(MODDESTDIR); \
++ do install -m 755 $$i $(MODDESTDIR); \
+ done
+ if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+ if [ -f $(MODDESTDIR)/m_xt.so ]; \
diff --git a/patches/iproute2-2.6.31/series b/patches/iproute2-2.6.34/series
index 94ffa3a22..bbfd5308c 100644
--- a/patches/iproute2-2.6.31/series
+++ b/patches/iproute2-2.6.34/series
@@ -1,2 +1,3 @@
0001-remove-duplicate-limits.h.patch
0002-remove_arpd.diff
+0003-install-tc.diff