diff options
| author |   Chris Larson <chris_larson@mentor.com> | 2011-01-23 12:31:03 -0500 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2011-01-23 12:31:03 -0500 |
| commit | c03c179bb19249b86c9ba0c6ea88701689ed2f3e (patch) | |
| tree | 9a97efbe36fe95b63ed422426653dfba9966a4da | |
| parent | 3b6561e0269fcfad39503dfa255c3738e8f3052a (diff) | |
| download | openembedded-c03c179bb19249b86c9ba0c6ea88701689ed2f3e.tar.gz | |
netperf: fix patch
Signed-off-by: Chris Larson <chris_larson@mentor.com>
| -rwxr-xr-x | recipes/netperf/files/vfork.patch | 20 | ||||
| -rw-r--r-- | recipes/netperf/netperf_2.4.4.bb | 2 |
2 files changed, 10 insertions, 12 deletions
diff --git a/recipes/netperf/files/vfork.patch b/recipes/netperf/files/vfork.patch index adbe8c6f3c..a40c96fcaf 100755 --- a/recipes/netperf/files/vfork.patch +++ b/recipes/netperf/files/vfork.patch @@ -1,6 +1,5 @@ -diff --exclude CVS -uNr netperf-2.4.3/src/netserver.c netperf-2.4.3.modified/src/netserver.c ---- netperf-2.4.3/src/netserver.c 2007-02-15 18:22:40.000000000 -0700 -+++ netperf-2.4.3.modified/src/netserver.c 2007-12-05 11:42:25.000000000 -0700 +--- netperf-2.4.4/src/netserver.c 2007-10-17 17:09:12.000000000 -0400 ++++ netperf-2.4.4.new/src/netserver.c 2011-01-23 12:26:39.000000000 -0500 @@ -567,7 +567,11 @@ fflush (stdin); fflush (stdout); @@ -11,18 +10,17 @@ diff --exclude CVS -uNr netperf-2.4.3/src/netserver.c netperf-2.4.3.modified/src + switch (vfork()) +#endif { - case -1: + case -1: perror("netperf server error"); -@@ -711,8 +715,11 @@ - } +@@ -712,7 +716,11 @@ #else signal(SIGCLD, SIG_IGN); -- + +#if defined(HAVE_FORK) - switch (fork()) + switch (fork()) +#else + switch (vfork()) +#endif - { - case -1: - /* something went wrong */ + { + case -1: + /* something went wrong */ diff --git a/recipes/netperf/netperf_2.4.4.bb b/recipes/netperf/netperf_2.4.4.bb index 783cd552b4..4ffa822198 100644 --- a/recipes/netperf/netperf_2.4.4.bb +++ b/recipes/netperf/netperf_2.4.4.bb @@ -2,7 +2,7 @@ DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets SECTION = "console/network" HOMEPAGE = "http://www.netperf.org/" LICENSE = "netperf" -PR = "r2" +PR = "r3" SRC_URI="ftp://ftp.netperf.org/netperf/archive/netperf-${PV}.tar.bz2 \ file://cpu_set.patch \ |