From e395bb87f0d8cc11091290897bc8fb2ba1484ceb Mon Sep 17 00:00:00 2001
From: David Karlstrom <daka@thg.se>
Date: Wed, 3 Aug 2005 17:39:51 +0000
Subject: Fix the iperf patch, and move back from nonworking

---
 packages/iperf/.mtn2git_empty                      |  0
 packages/iperf/iperf-1.7.0/.mtn2git_empty          |  0
 packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff | 11 +++++++++
 packages/iperf/iperf_1.7.0.bb                      | 26 +++++++++++++++++++++
 packages/nonworking/iperf/.mtn2git_empty           |  0
 .../nonworking/iperf/iperf-1.7.0/.mtn2git_empty    |  0
 .../iperf/iperf-1.7.0/socketaddr-h-errno.diff      | 11 ---------
 packages/nonworking/iperf/iperf_1.7.0.bb           | 27 ----------------------
 8 files changed, 37 insertions(+), 38 deletions(-)
 create mode 100644 packages/iperf/.mtn2git_empty
 create mode 100644 packages/iperf/iperf-1.7.0/.mtn2git_empty
 create mode 100644 packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff
 create mode 100644 packages/iperf/iperf_1.7.0.bb
 delete mode 100644 packages/nonworking/iperf/.mtn2git_empty
 delete mode 100644 packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty
 delete mode 100644 packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff
 delete mode 100644 packages/nonworking/iperf/iperf_1.7.0.bb

(limited to 'packages')

diff --git a/packages/iperf/.mtn2git_empty b/packages/iperf/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/iperf/iperf-1.7.0/.mtn2git_empty b/packages/iperf/iperf-1.7.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff b/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff
new file mode 100644
index 0000000000..4f32e7498f
--- /dev/null
+++ b/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff
@@ -0,0 +1,11 @@
+--- ./../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 @@
+ 
+ 
+ #ifndef WIN32
+-extern int h_errno;
++//extern int h_errno;
+ #endif
+ 
+ Socklen_t SocketAddr::mAddress_size = sizeof(iperf_sockaddr);
diff --git a/packages/iperf/iperf_1.7.0.bb b/packages/iperf/iperf_1.7.0.bb
new file mode 100644
index 0000000000..e6ab2b0e51
--- /dev/null
+++ b/packages/iperf/iperf_1.7.0.bb
@@ -0,0 +1,26 @@
+SECTION = "console/network"
+DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of various parameters and UDP characteristics"
+HOMEPAGE = "http://dast.nlanr.net/Projects/Iperf/"
+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"
+
+inherit autotools
+
+S="${WORKDIR}/iperf-${PV}/cfg"
+
+do_configure() {
+	oe_runconf
+}
+
+do_compile() {
+	cd ${WORKDIR}/iperf-${PV}
+	oe_runmake
+}
+
+do_install() {
+	cd ${WORKDIR}/iperf-${PV}/src
+	oe_runmake INSTALL_DIR=${D}${bindir} install
+}
diff --git a/packages/nonworking/iperf/.mtn2git_empty b/packages/nonworking/iperf/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty b/packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff b/packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff
deleted file mode 100644
index 15b1bc2928..0000000000
--- a/packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 @@
- 
- 
- #ifndef WIN32
--extern int h_errno;
-+//extern int h_errno;
- #endif
- 
- Socklen_t SocketAddr::mAddress_size = sizeof(iperf_sockaddr);
diff --git a/packages/nonworking/iperf/iperf_1.7.0.bb b/packages/nonworking/iperf/iperf_1.7.0.bb
deleted file mode 100644
index ef075e8c8a..0000000000
--- a/packages/nonworking/iperf/iperf_1.7.0.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SECTION = "console/network"
-DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of various parameters and UDP characteristics"
-HOMEPAGE = "http://dast.nlanr.net/Projects/Iperf/"
-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"
-
-inherit autotools
-
-S="${WORKDIR}/iperf-${PV}/cfg"
-PATCHES_DIR="${WORKDIR}/iperf-${PV}"
-
-do_configure() {
-	oe_runconf
-}
-
-do_compile() {
-	cd ${WORKDIR}/iperf-${PV}
-	oe_runmake
-}
-
-do_install() {
-	cd ${WORKDIR}/iperf-${PV}/src
-	oe_runmake INSTALL_DIR=${D}${bindir} install
-}
-- 
cgit v1.2.3