diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2010-04-28 07:50:05 +0200 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2010-05-03 13:17:44 +0200 |
| commit | 9672da8e4a7ef9265b5b8de4b880c18dea17a5ed (patch) | |
| tree | e61e53903d9bd3f8c13cd8671d70018fb2bf8949 /patches | |
| parent | 3c9db4c6d72a931a7b1bc8ccb936c652429081e9 (diff) | |
| download | ptxdist-9672da8e4a7ef9265b5b8de4b880c18dea17a5ed.tar.gz ptxdist-9672da8e4a7ef9265b5b8de4b880c18dea17a5ed.tar.xz | |
[iproute2] patch cleanup
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/iproute2-2.6.31/0001-remove-duplicate-limits.h.patch (renamed from patches/iproute2-2.6.31/0003-remove-duplicate-limits.h.patch) | 7 | ||||
| -rw-r--r-- | patches/iproute2-2.6.31/0002-remove_arpd.diff (renamed from patches/iproute2-2.6.31/remove_arpd.diff) | 12 | ||||
| -rw-r--r-- | patches/iproute2-2.6.31/series | 4 |
3 files changed, 17 insertions, 6 deletions
diff --git a/patches/iproute2-2.6.31/0003-remove-duplicate-limits.h.patch b/patches/iproute2-2.6.31/0001-remove-duplicate-limits.h.patch index 5fa534a07..b98620360 100644 --- a/patches/iproute2-2.6.31/0003-remove-duplicate-limits.h.patch +++ b/patches/iproute2-2.6.31/0001-remove-duplicate-limits.h.patch @@ -1,8 +1,15 @@ +From: Robert Schwebel <r.schwebel@pengutronix.de> +Subject: [iproute2] remove duplicate header file + +This patch is already in upstream: + From 52d6a850505d70a699fc89604986c45b0cd0c54e Mon Sep 17 00:00:00 2001 From: Stephen Hemminger <stephen.hemminger@vyatta.com> Date: Fri, 27 Mar 2009 11:07:46 -0700 Subject: [PATCH 03/23] remove duplicate limits.h +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + --- tc/m_xt.c | 1 - 1 file changed, 1 deletion(-) diff --git a/patches/iproute2-2.6.31/remove_arpd.diff b/patches/iproute2-2.6.31/0002-remove_arpd.diff index 19cb240b9..ce791d942 100644 --- a/patches/iproute2-2.6.31/remove_arpd.diff +++ b/patches/iproute2-2.6.31/0002-remove_arpd.diff @@ -1,14 +1,18 @@ -Subject: Make the buildsystem be gracious to us. +Subject: [iproute2] build system fixes +From: Juergen Beisert <juergen@kreuzholzen.de> -Signed-off-by: Juergen Beisert juergen@kreuzholzen.de -[refreshed for iproute2-2.6.31] -Signed-off-by: Jon Ringle <jon@ringle.org> +Build arpd only if the user has requested it. +Add a mechanism to feed in CPPFLAGS for cross builds. +Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de> +Signed-off-by: Jon Ringle <jon@ringle.org> --- Makefile | 2 +- misc/Makefile | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) +Jon Ringle: refreshed for iproute2-2.6.31 + --- iproute2-2.6.31.orig/misc/Makefile 2009-12-26 13:26:44.000000000 -0500 +++ iproute2-2.6.31/misc/Makefile 2009-11-08 23:48:39.000000000 -0500 @@ -1,10 +1,14 @@ diff --git a/patches/iproute2-2.6.31/series b/patches/iproute2-2.6.31/series index b9140d116..94ffa3a22 100644 --- a/patches/iproute2-2.6.31/series +++ b/patches/iproute2-2.6.31/series @@ -1,2 +1,2 @@ -0003-remove-duplicate-limits.h.patch -remove_arpd.diff +0001-remove-duplicate-limits.h.patch +0002-remove_arpd.diff |