Fix the iperf patch, and move back from nonworking

diff --git a/packages/nonworking/iperf/.mtn2git_empty b/packages/iperf/.mtn2git_empty
similarity index 100%
rename from packages/nonworking/iperf/.mtn2git_empty
rename to packages/iperf/.mtn2git_empty

diff --git a/packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty b/packages/iperf/iperf-1.7.0/.mtn2git_empty
similarity index 100%
rename from packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty
rename to packages/iperf/iperf-1.7.0/.mtn2git_empty

diff --git a/packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff b/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff
similarity index 53%
rename from packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff
rename to packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff
index 15b1bc2..4f32e74 100644 (file)
--- a/packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff
+++ b/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff
@@ -1,5 +1,5 @@
---- lib/SocketAddr.cpp.orig    2004-10-05 12:10:06.763746800 +0200
-+++ lib/SocketAddr.cpp 2004-10-05 12:10:21.079570464 +0200
+--- ./../lib/SocketAddr.cpp.orig       2004-10-05 12:10:06.763746800 +0200
++++ ./../lib/SocketAddr.cpp    2004-10-05 12:10:21.079570464 +0200
 @@ -65,7 +65,7 @@
  
  

diff --git a/packages/nonworking/iperf/iperf_1.7.0.bb b/packages/iperf/iperf_1.7.0.bb
similarity index 87%
rename from packages/nonworking/iperf/iperf_1.7.0.bb
rename to packages/iperf/iperf_1.7.0.bb
index ef075e8..e6ab2b0 100644 (file)
--- a/packages/nonworking/iperf/iperf_1.7.0.bb
+++ b/packages/iperf/iperf_1.7.0.bb
@@ -5,12 +5,11 @@ LICENSE = "BSD"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 
 SRC_URI = "http://dast.nlanr.net/Projects/Iperf/iperf-${PV}-source.tar.gz \
-       file://socketaddr-h-errno.diff;patch=1;pnum=0"
+       file://socketaddr-h-errno.diff;patch=1"
 
 inherit autotools
 
 S="${WORKDIR}/iperf-${PV}/cfg"
-PATCHES_DIR="${WORKDIR}/iperf-${PV}"
 
 do_configure() {
        oe_runconf