* [PATCH v2 meta-oe] netperf: add version 2.4.4
@ 2011-12-28 8:31 b19537
2012-01-16 9:34 ` Luo Zhenhua-B19537
0 siblings, 1 reply; 4+ messages in thread
From: b19537 @ 2011-12-28 8:31 UTC (permalink / raw)
To: openembedded-devel
From: Zhenhua Luo <b19537@freescale.com>
Signed-off-by: Zhenhua Luo <b19537@freescale.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 | 46 ++++++++++++++++++
4 files changed, 147 insertions(+), 0 deletions(-)
create mode 100644 meta-oe/recipes-benchmark/netperf/files/cpu_set.patch
create mode 100644 meta-oe/recipes-benchmark/netperf/files/init
create mode 100644 meta-oe/recipes-benchmark/netperf/files/vfork.patch
create mode 100644 meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb
diff --git a/meta-oe/recipes-benchmark/netperf/files/cpu_set.patch b/meta-oe/recipes-benchmark/netperf/files/cpu_set.patch
new file mode 100644
index 0000000..b2b95c7
--- /dev/null
+++ b/meta-oe/recipes-benchmark/netperf/files/cpu_set.patch
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 0000000..7cc053a
--- /dev/null
+++ b/meta-oe/recipes-benchmark/netperf/files/init
@@ -0,0 +1,51 @@
+#!/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
new file mode 100644
index 0000000..a40c96f
--- /dev/null
+++ b/meta-oe/recipes-benchmark/netperf/files/vfork.patch
@@ -0,0 +1,26 @@
+--- 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
new file mode 100644
index 0000000..6a3a81c
--- /dev/null
+++ b/meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb
@@ -0,0 +1,46 @@
+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"
+
+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_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"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 meta-oe] netperf: add version 2.4.4
2011-12-28 8:31 [PATCH v2 meta-oe] netperf: add version 2.4.4 b19537
@ 2012-01-16 9:34 ` Luo Zhenhua-B19537
2012-01-16 11:21 ` Koen Kooi
0 siblings, 1 reply; 4+ messages in thread
From: Luo Zhenhua-B19537 @ 2012-01-16 9:34 UTC (permalink / raw)
To: openembedded-devel
Hello,
Any comment on it?
Best Regards,
Zhenhua
> -----Original Message-----
> From: Luo Zhenhua-B19537
> Sent: Wednesday, December 28, 2011 4:31 PM
> To: openembedded-devel@lists.openembedded.org
> Cc: Luo Zhenhua-B19537
> Subject: [PATCH v2 meta-oe] netperf: add version 2.4.4
>
> From: Zhenhua Luo <b19537@freescale.com>
>
> Signed-off-by: Zhenhua Luo <b19537@freescale.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 | 46 ++++++++++++++++++
> 4 files changed, 147 insertions(+), 0 deletions(-) create mode 100644 meta-
> oe/recipes-benchmark/netperf/files/cpu_set.patch
> create mode 100644 meta-oe/recipes-benchmark/netperf/files/init
> create mode 100644 meta-oe/recipes-benchmark/netperf/files/vfork.patch
> create mode 100644 meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb
>
> diff --git a/meta-oe/recipes-benchmark/netperf/files/cpu_set.patch b/meta-
> oe/recipes-benchmark/netperf/files/cpu_set.patch
> new file mode 100644
> index 0000000..b2b95c7
> --- /dev/null
> +++ b/meta-oe/recipes-benchmark/netperf/files/cpu_set.patch
> @@ -0,0 +1,24 @@
> +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
> new file mode 100644
> index 0000000..7cc053a
> --- /dev/null
> +++ b/meta-oe/recipes-benchmark/netperf/files/init
> @@ -0,0 +1,51 @@
> +#!/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
> new file mode 100644
> index 0000000..a40c96f
> --- /dev/null
> +++ b/meta-oe/recipes-benchmark/netperf/files/vfork.patch
> @@ -0,0 +1,26 @@
> +--- 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
> new file mode 100644
> index 0000000..6a3a81c
> --- /dev/null
> +++ b/meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb
> @@ -0,0 +1,46 @@
> +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"
> +
> +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_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"
> --
> 1.7.0.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 meta-oe] netperf: add version 2.4.4
2012-01-16 9:34 ` Luo Zhenhua-B19537
@ 2012-01-16 11:21 ` Koen Kooi
2012-01-17 3:11 ` Luo Zhenhua-B19537
0 siblings, 1 reply; 4+ messages in thread
From: Koen Kooi @ 2012-01-16 11:21 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 16-01-12 10:34, Luo Zhenhua-B19537 schreef:
> Hello,
>
> Any comment on it?
No, please rebase and resend
>
>
> Best Regards,
>
> Zhenhua
>
>
>> -----Original Message----- From: Luo Zhenhua-B19537 Sent: Wednesday,
>> December 28, 2011 4:31 PM To:
>> openembedded-devel@lists.openembedded.org Cc: Luo Zhenhua-B19537
>> Subject: [PATCH v2 meta-oe] netperf: add version 2.4.4
>>
>> From: Zhenhua Luo <b19537@freescale.com>
>>
>> Signed-off-by: Zhenhua Luo <b19537@freescale.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 |
>> 46 ++++++++++++++++++ 4 files changed, 147 insertions(+), 0
>> deletions(-) create mode 100644 meta-
>> oe/recipes-benchmark/netperf/files/cpu_set.patch create mode 100644
>> meta-oe/recipes-benchmark/netperf/files/init create mode 100644
>> meta-oe/recipes-benchmark/netperf/files/vfork.patch create mode 100644
>> meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb
>>
>> diff --git a/meta-oe/recipes-benchmark/netperf/files/cpu_set.patch
>> b/meta- oe/recipes-benchmark/netperf/files/cpu_set.patch new file mode
>> 100644 index 0000000..b2b95c7 --- /dev/null +++
>> b/meta-oe/recipes-benchmark/netperf/files/cpu_set.patch @@ -0,0 +1,24
>> @@ +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 new file mode 100644 index
>> 0000000..7cc053a --- /dev/null +++
>> b/meta-oe/recipes-benchmark/netperf/files/init @@ -0,0 +1,51 @@
>> +#!/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 new file mode
>> 100644 index 0000000..a40c96f --- /dev/null +++
>> b/meta-oe/recipes-benchmark/netperf/files/vfork.patch @@ -0,0 +1,26 @@
>> +--- 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 new file mode 100644
>> index 0000000..6a3a81c --- /dev/null +++
>> b/meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb @@ -0,0 +1,46 @@
>> +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" +
>> +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_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" -- 1.7.0.4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org
iEYEARECAAYFAk8UCDQACgkQMkyGM64RGpHofACgmAF+NuS+IOX3q/lmQL/Ya0zW
hnQAoIL0UrAFgY8dfxKbUqtAzj2Gk8gx
=odbb
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 meta-oe] netperf: add version 2.4.4
2012-01-16 11:21 ` Koen Kooi
@ 2012-01-17 3:11 ` Luo Zhenhua-B19537
0 siblings, 0 replies; 4+ messages in thread
From: Luo Zhenhua-B19537 @ 2012-01-17 3:11 UTC (permalink / raw)
To: openembedded-devel
Hello Koen,
May I know what's the issue of this patch? I can apply the patch in HEAD of meta-oe tree successfully.
Best Regards,
Zhenhua
> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org [mailto:openembedded-
> devel-bounces@lists.openembedded.org] On Behalf Of Koen Kooi
> Sent: Monday, January 16, 2012 7:21 PM
> To: openembedded-devel@lists.openembedded.org
> Subject: Re: [oe] [PATCH v2 meta-oe] netperf: add version 2.4.4
>
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 16-01-12 10:34, Luo Zhenhua-B19537 schreef:
> > Hello,
> >
> > Any comment on it?
>
> No, please rebase and resend
>
> >
> >
> > Best Regards,
> >
> > Zhenhua
> >
> >
> >> -----Original Message----- From: Luo Zhenhua-B19537 Sent: Wednesday,
> >> December 28, 2011 4:31 PM To:
> >> openembedded-devel@lists.openembedded.org Cc: Luo Zhenhua-B19537
> >> Subject: [PATCH v2 meta-oe] netperf: add version 2.4.4
> >>
> >> From: Zhenhua Luo <b19537@freescale.com>
> >>
> >> Signed-off-by: Zhenhua Luo <b19537@freescale.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
> >> | |
> >> 46 ++++++++++++++++++ 4 files changed, 147 insertions(+), 0
> >> deletions(-) create mode 100644 meta-
> >> oe/recipes-benchmark/netperf/files/cpu_set.patch create mode 100644
> >> meta-oe/recipes-benchmark/netperf/files/init create mode 100644
> >> meta-oe/recipes-benchmark/netperf/files/vfork.patch create mode
> >> 100644 meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb
> >>
> >> diff --git a/meta-oe/recipes-benchmark/netperf/files/cpu_set.patch
> >> b/meta- oe/recipes-benchmark/netperf/files/cpu_set.patch new file
> >> mode
> >> 100644 index 0000000..b2b95c7 --- /dev/null +++
> >> b/meta-oe/recipes-benchmark/netperf/files/cpu_set.patch @@ -0,0 +1,24
> >> @@ +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 new file mode 100644 index
> >> 0000000..7cc053a --- /dev/null +++
> >> b/meta-oe/recipes-benchmark/netperf/files/init @@ -0,0 +1,51 @@
> >> +#!/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 new file mode
> >> 100644 index 0000000..a40c96f --- /dev/null +++
> >> b/meta-oe/recipes-benchmark/netperf/files/vfork.patch @@ -0,0 +1,26
> >> @@
> >> +--- 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 new file mode 100644
> >> index 0000000..6a3a81c --- /dev/null +++
> >> b/meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb @@ -0,0 +1,46 @@
> >> +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" +
> >> +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_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" -- 1.7.0.4
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.11 (Darwin)
> Comment: GPGTools - http://gpgtools.org
>
> iEYEARECAAYFAk8UCDQACgkQMkyGM64RGpHofACgmAF+NuS+IOX3q/lmQL/Ya0zW
> hnQAoIL0UrAFgY8dfxKbUqtAzj2Gk8gx
> =odbb
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-01-17 3:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-28 8:31 [PATCH v2 meta-oe] netperf: add version 2.4.4 b19537
2012-01-16 9:34 ` Luo Zhenhua-B19537
2012-01-16 11:21 ` Koen Kooi
2012-01-17 3:11 ` Luo Zhenhua-B19537
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.