Patchwork [meta-oe,4/4] netperf: remove

login
register
mail settings
Submitter Paul Eggleton
Date Nov. 27, 2012, 12:11 p.m.
Message ID <73d9cbf1723fd6b6ca2a1f59b9523efaa779abfb.1354018185.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/39683/
State Accepted
Commit f58e6aa8e8a2cfd1713594e51d864d302d11a24e
Headers show

Comments

Paul Eggleton - Nov. 27, 2012, 12:11 p.m.
Version 2.6.0 is now in meta-networking.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../recipes-benchmark/netperf/files/cpu_set.patch  |   24 ---------
 meta-oe/recipes-benchmark/netperf/files/init       |   51 ------------------
 .../recipes-benchmark/netperf/files/vfork.patch    |   26 ---------
 meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb |   56 --------------------
 4 files changed, 157 deletions(-)
 delete mode 100644 meta-oe/recipes-benchmark/netperf/files/cpu_set.patch
 delete mode 100644 meta-oe/recipes-benchmark/netperf/files/init
 delete mode 100644 meta-oe/recipes-benchmark/netperf/files/vfork.patch
 delete mode 100644 meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb

Patch

diff --git a/meta-oe/recipes-benchmark/netperf/files/cpu_set.patch b/meta-oe/recipes-benchmark/netperf/files/cpu_set.patch
deleted file mode 100644
index b2b95c7..0000000
--- a/meta-oe/recipes-benchmark/netperf/files/cpu_set.patch
+++ /dev/null
@@ -1,24 +0,0 @@ 
-Index: netperf-2.4.4/src/netlib.c
-===================================================================
---- netperf-2.4.4.orig/src/netlib.c	2007-10-17 23:16:02.000000000 +0200
-+++ netperf-2.4.4/src/netlib.c	2008-12-03 17:56:32.000000000 +0100
-@@ -1988,10 +1988,15 @@
-      fall-back on what we had before, which is to use just the size of
-      an unsigned long. raj 2006-09-14 */
- 
--#if defined(__CPU_SETSIZE)
--#define NETPERF_CPU_SETSIZE __CPU_SETSIZE
--#define NETPERF_CPU_SET(cpu, cpusetp)  __CPU_SET(cpu, cpusetp)
--#define NETPERF_CPU_ZERO(cpusetp)      __CPU_ZERO (cpusetp)
-+#if defined(CPU_SETSIZE)
-+#define NETPERF_CPU_SETSIZE CPU_SETSIZE
-+#define NETPERF_CPU_SET(cpu, cpusetp)  CPU_SET(cpu, cpusetp)
-+#define NETPERF_CPU_ZERO(cpusetp)      CPU_ZERO (cpusetp)
-+  typedef cpu_set_t netperf_cpu_set_t;
-+#elif defined(__CPU_SETSIZE)
-+#define NETPERF_CPU_SETSIZE __CPU_SETSIZE
-+#define NETPERF_CPU_SET(cpu, cpusetp)  __CPU_SET (cpu, cpusetp)
-+#define NETPERF_CPU_ZERO(cpusetp)      __CPU_ZERO (cpusetp)
-   typedef cpu_set_t netperf_cpu_set_t;
- #else
- #define NETPERF_CPU_SETSIZE sizeof(unsigned long)
diff --git a/meta-oe/recipes-benchmark/netperf/files/init b/meta-oe/recipes-benchmark/netperf/files/init
deleted file mode 100644
index 7cc053a..0000000
--- a/meta-oe/recipes-benchmark/netperf/files/init
+++ /dev/null
@@ -1,51 +0,0 @@ 
-#!/bin/sh
-#
-#
-# Written by Miquel van Smoorenburg <miquels@cistron.nl>.
-# Modified for Debian GNU/Linux by Ian Murdock <imurdock@gnu.org>.
-# Modified for Debian by Christoph Lameter <clameter@debian.org>
-# Modified for openembedded by Bruno Randolf <bruno.randolf@4g-systems.biz>
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-DAEMON=/usr/sbin/netserver
-
-test -f $DAEMON || exit 0
-
-case "$1" in
-  start)
-		echo -n "Starting network benchmark server: netserver"
-    start-stop-daemon -S -x $DAEMON > /dev/null 2>&1 
-		echo "."
-    ;;
-  stop)
-		echo -n "Stopping network benchmark server: netserver"
-    start-stop-daemon -K -x $DAEMON
-		echo "."
-    ;;
-  #reload)
-    #
-    # If the daemon can reload its config files on the fly
-    # for example by sending it SIGHUP, do it here.
-    #
-    # If the daemon responds to changes in its config file
-    # directly anyway, make this a do-nothing entry.
-    #
-    # start-stop-daemon --stop --signal 1 --verbose --exec $DAEMON
-    # ;;
-  restart|force-reload)
-  #
-  # If the "reload" option is implemented, move the "force-reload"
-  # option to the "reload" entry above. If not, "force-reload" is
-  # just the same as "restart".
-  #
-    start-stop-daemon -K -x $DAEMON
-    sleep 1
-    start-stop-daemon -S -x $DAEMON
-    ;;
-  *)
-    echo "Usage: /etc/init.d/netperf {start|stop|restart|force-reload}"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/meta-oe/recipes-benchmark/netperf/files/vfork.patch b/meta-oe/recipes-benchmark/netperf/files/vfork.patch
deleted file mode 100644
index a40c96f..0000000
--- a/meta-oe/recipes-benchmark/netperf/files/vfork.patch
+++ /dev/null
@@ -1,26 +0,0 @@ 
---- 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);
-   fflush (stderr);
-+#if defined(HAVE_FORK)
-   switch (fork())
-+#else
-+  switch (vfork())
-+#endif
-     {
-     case -1:  	
-       perror("netperf server error");
-@@ -712,7 +716,11 @@
- #else
-       signal(SIGCLD, SIG_IGN);
- 	  
-+#if defined(HAVE_FORK)
- 	  switch (fork())
-+#else
-+	  switch (vfork())
-+#endif
- 	    {
- 	    case -1:
- 	      /* something went wrong */
diff --git a/meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb b/meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb
deleted file mode 100644
index 15174ca..0000000
--- a/meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb
+++ /dev/null
@@ -1,56 +0,0 @@ 
-DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more."
-SECTION = "console/network"
-HOMEPAGE = "http://www.netperf.org/"
-LICENSE = "GPLv2+"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=a0ab17253e7a3f318da85382c7d5d5d6"
-
-SRC_URI="ftp://ftp.netperf.org/netperf/archive/netperf-${PV}.tar.bz2 \
-         file://cpu_set.patch \
-         file://vfork.patch \
-         file://init"
-
-SRC_URI[md5sum] = "0e942f22864e601406a994420231075b"
-SRC_URI[sha256sum] = "28e76af491ea3696885e4558ae2f5628a4b9ebdbefc2f1d9cf1b35db2813e497"
-
-PR = "r1"
-
-inherit update-rc.d autotools
-
-S = "${WORKDIR}/netperf-${PV}"
-
-# cpu_set.patch plus _GNU_SOURCE makes src/netlib.c compile with CPU_ macros
-CFLAGS_append = " -DDO_UNIX -DDO_IPV6 -D_GNU_SOURCE"
-
-do_configure_prepend () {
-    sed -i -e 's,^ *NETHOME=.*$,NETHOME=${bindir},' \
-           -e 's,^ *NETPERF=\./netperf$,NETPERF=${bindir}/netperf,' \
-           -e 's,^ *NETPERF=/usr/bin/netperf$,NETPERF=${bindir}/netperf,' \
-           -e 's,^ *NETPERF_CMD=.*$,NETPERF_CMD=${bindir}/netperf,' \
-           doc/examples/*_script
-}
-
-do_install() {
-        install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d
-        install -m 4755 src/netperf ${D}${bindir}
-        install -m 4755 src/netserver ${D}${sbindir}
-        install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/netperf
-
-        # man
-        install -d ${D}${mandir}/man1/
-        install -m 0644 doc/netserver.man ${D}${mandir}/man1/netserver.1
-        install -m 0644 doc/netperf.man ${D}${mandir}/man1/netperf.1
-
-        # move scripts to examples directory
-        install -d ${D}${docdir}/netperf/examples
-        install -m 0644 doc/examples/*_script ${D}${docdir}/netperf/examples/
-
-        # docs ..
-        install -m 0644 COPYING ${D}${docdir}/netperf
-        install -m 0644 Release_Notes ${D}${docdir}/netperf
-        install -m 0644 README ${D}${docdir}/netperf
-        install -m 0644 doc/netperf_old.ps ${D}${docdir}/netperf
-}
-
-INITSCRIPT_NAME="netperf"
-INITSCRIPT_PARAMS="defaults"