netperf: import recipe
PATCH 1/2 netperf: import recipe
Git-Url:
- http://git.openembedded.org/openembedded/tree/recipes/netperf/
--- .../recipes-support/netperf/files/cpu_set.patch | 24 +++++++++ meta-networking/recipes-support/netperf/files/init | 51 ++++++++++++++++++++ .../recipes-support/netperf/files/vfork.patch | 26 ++++++++++ .../recipes-support/netperf/netperf_2.4.4.bb | 45 +++++++++++++++++ 4 files changed, 146 insertions(+), 0 deletions(-) create mode 100644 meta-networking/recipes-support/netperf/files/cpu_set.patch create mode 100644 meta-networking/recipes-support/netperf/files/init create mode 100644 meta-networking/recipes-support/netperf/files/vfork.patch create mode 100644 meta-networking/recipes-support/netperf/netperf_2.4.4.bb
meta-networking/recipes-support/netperf/files/cpu_set.patch new file +24 -0
@@ -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)
meta-networking/recipes-support/netperf/files/init new file +51 -0
51 lines not on this page · raw message
meta-networking/recipes-support/netperf/files/vfork.patch new file +26 -0
@@ -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 */
meta-networking/recipes-support/netperf/netperf_2.4.4.bb new file +45 -0
45 lines not on this page · raw message
Signature · 1 line
1.7.5.4
PATCH 2/2 netperf: uprev to 2.6.0
Also fix license, summary and patches.
---
.../recipes-support/netperf/files/cpu_set.patch | 34 ++++++----
.../recipes-support/netperf/files/vfork.patch | 72 ++++++++++++++------
.../netperf/{netperf_2.4.4.bb => netperf_2.6.0.bb} | 23 +++++--
3 files changed, 89 insertions(+), 40 deletions(-)
rename meta-networking/recipes-support/netperf/{netperf_2.4.4.bb => netperf_2.6.0.bb} (65%)meta-networking/recipes-support/netperf/files/cpu_set.patch +20 -14
@@ -1,24 +1,30 @@ -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 @@ +Subject: [PATCH] netperf: fix CPU_SETSIZE to build with eglibc + +Upstream-Status: Pending + +Signed-off-by: Xin Ouyang <[email protected]> +--- + src/netlib.c | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/src/netlib.c b/src/netlib.c +index 206e002..e33aae6 100644 +--- a/src/netlib.c ++++ b/src/netlib.c +@@ -2265,7 +2265,12 @@ bind_to_specific_processor(int processor_affinity, int use_cpu_map) 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) + #define NETPERF_CPU_SETSIZE __CPU_SETSIZE + #if defined(__CPU_SET_S) + #define NETPERF_CPU_SET(cpu, cpusetp) __CPU_SET_S(cpu, sizeof (cpu_set_t), cpusetp) +-- +1.7.1.1 +
meta-networking/recipes-support/netperf/files/vfork.patch +52 -20
78 lines not on this page · raw message
meta-networking/recipes-support/netperf/netperf_2.6.0.bb renamed from meta-networking/recipes-support/netperf/netperf_2.4.4.bb +17 -6
@@ -1,14 +1,19 @@ -DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more." +SUMMARY = "A networking benchmarking tool" +DESCRIPTION = "Network performance benchmark including tests for TCP, UDP, sockets, ATM and more." SECTION = "console/network" HOMEPAGE = "http://www.netperf.org/" -LICENSE = "netperf" -PR = "r3" +LICENSE = "HP" +LICENSE_FLAGS = "commercial" -SRC_URI="ftp://ftp.netperf.org/netperf/archive/netperf-${PV}.tar.bz2 \ +PR = "r0" + +SRC_URI="ftp://ftp.netperf.org/netperf/netperf-${PV}.tar.bz2 \ file://cpu_set.patch \ file://vfork.patch \ file://init" +LIC_FILES_CHKSUM = "file://COPYING;md5=a0ab17253e7a3f318da85382c7d5d5d6" + inherit update-rc.d autotools S = "${WORKDIR}/netperf-${PV}"
@@ -16,6 +21,12 @@ 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" +# autotools.bbclass attends to include m4 files with path depth <= 2 by +# "find ${S} -maxdepth 2 -name \*.m4", so move m4 files from m4/m4. +do_configure_prepend() { + test -d m4/m4 && mv -f m4/m4 m4-files +} + do_install() { install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d install -m 4755 src/netperf ${D}${bindir}
@@ -41,5 +52,5 @@ do_install() { INITSCRIPT_NAME="netperf" INITSCRIPT_PARAMS="defaults" -SRC_URI[md5sum] = "0e942f22864e601406a994420231075b" -SRC_URI[sha256sum] = "28e76af491ea3696885e4558ae2f5628a4b9ebdbefc2f1d9cf1b35db2813e497" +SRC_URI[md5sum] = "9654ffdfd4c4f2c93ce3733cd9ed9236" +SRC_URI[sha256sum] = "cd8dac710d4273d29f70e8dbd09353a6362ac58a11926e0822233c0cb230323a"
Signature · 1 line
1.7.5.4
Re: [PATCH][meta-networking 2/2] netperf: uprev to 2.6.0
Quoted 3 lines · On Thursday 01 November 2012 09:42:46 Xin Ouyang wrote:
Also fix license, summary and patches.
Signed-off-by Xin Ouyang <[email protected]>
These two patches should really be squashed into one - this is the convention we've established for importing recipes from OE-Classic (as long as "Import from OE-Classic" or similar is mentioned somewhere in the commit message).
meta-networking/recipes-support/netperf/netperf_2.6.0.bb line 5
Quoted 13 lines
meta-networking/recipes-support/netperf/netperf_2.6.0.bb renamed from meta-networking/recipes-support/netperf/netperf_2.4.4.bb +0
-1@@ -1,14 +1,19 @@ -DESCRIPTION="Network performance benchmark including tests for TCP, UDP,sockets, ATM and more."
meta-networking/recipes-support/netperf/netperf_2.6.0.bb renamed from meta-networking/recipes-support/netperf/netperf_2.4.4.bb +2
-0+SUMMARY = "A networking benchmarking tool" +DESCRIPTION = "Network performance benchmark including tests for TCP, UDP,sockets, ATM and more."
SECTION = "console/network"
HOMEPAGE = "http://www.netperf.org/"meta-networking/recipes-support/netperf/netperf_2.6.0.bb renamed from meta-networking/recipes-support/netperf/netperf_2.4.4.bb +1
-2-LICENSE = "netperf" -PR = "r3" +LICENSE = "HP"
There's no standard license known as "HP" so "netperf" for LICENSE is correct
- it means it's a license specific to the netperf software package.
Quoted 1 line
+LICENSE_FLAGS = "commercial"
Good point - I think many would miss the non-commercial use only clause in the license otherwise.
Quoted 3 lines
meta-networking/recipes-support/netperf/netperf_2.6.0.bb renamed from meta-networking/recipes-support/netperf/netperf_2.4.4.bb +2
-0+SRC_URI[md5sum] = "9654ffdfd4c4f2c93ce3733cd9ed9236" +SRC_URI[sha256sum] ="
cd8dac710d4273d29f70e8dbd09353a6362ac58a11926e0822233c0cb230323a"
I think we prefer to put these next to SRC_URI these days (or at least I do).
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Re: [PATCH][meta-networking 2/2] netperf: uprev to 2.6.0
Quoted 28 lines · Paul Eggleton
Quoted 3 lines · On Thursday 01 November 2012 09:42:46 Xin Ouyang wrote:
Also fix license, summary and patches.
Signed-off-by Xin Ouyang <[email protected]>These two patches should really be squashed into one - this is the convention we've established for importing recipes from OE-Classic (as long as "Import from OE-Classic" or similar is mentioned somewhere in the commit message).
meta-networking/recipes-support/netperf/netperf_2.6.0.bb line 5
Quoted 13 lines
meta-networking/recipes-support/netperf/netperf_2.6.0.bb renamed from meta-networking/recipes-support/netperf/netperf_2.4.4.bb +0
-1@@ -1,14 +1,19 @@ -DESCRIPTION="Network performance benchmark including tests for TCP, UDP,sockets, ATM and more."
meta-networking/recipes-support/netperf/netperf_2.6.0.bb renamed from meta-networking/recipes-support/netperf/netperf_2.4.4.bb +2
-0+SUMMARY = "A networking benchmarking tool" +DESCRIPTION = "Network performance benchmark including tests for TCP, UDP,sockets, ATM and more."
SECTION = "console/network"
HOMEPAGE = "http://www.netperf.org/"meta-networking/recipes-support/netperf/netperf_2.6.0.bb renamed from meta-networking/recipes-support/netperf/netperf_2.4.4.bb +1
-2-LICENSE = "netperf" -PR = "r3" +LICENSE = "HP"There's no standard license known as "HP" so "netperf" for LICENSE is correct
- it means it's a license specific to the netperf software package.Quoted 1 line
+LICENSE_FLAGS = "commercial"
Quoted 8 lines
Good point - I think many would miss the non-commercial use only clause in the license otherwise.
Quoted 3 lines
meta-networking/recipes-support/netperf/netperf_2.6.0.bb renamed from meta-networking/recipes-support/netperf/netperf_2.4.4.bb +2
-0+SRC_URI[md5sum] = "9654ffdfd4c4f2c93ce3733cd9ed9236" +SRC_URI[sha256sum] ="
cd8dac710d4273d29f70e8dbd09353a6362ac58a11926e0822233c0cb230323a"I think we prefer to put these next to
SRC_URIthese days (or at least I do).
OK, a V2 will be sent with these fixes.
Thanks.
- Pascal
Quoted 4 lines
Cheers,
Paul
Signature · 1 line
- Pascal
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 01-11-12 02:42, Xin Ouyang schreef:
Quoted 7 lines
Git-Url: -
http://git.openembedded.org/openembedded/tree/recipes/netperf/Signed-off-by Xin Ouyang <[email protected]> ---.../recipes-support/netperf/files/cpu_set.patch | 24 +++++++++ meta-networking/recipes-support/netperf/files/init | 51++++++++++++++++++++
The initscript is missing LSB headers and hardcodes $sbindir to /usr/sbin.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFQk6XuMkyGM64RGpERApMQAJ0f0YMb53j54pjbXUpl7b6RCjWm7gCgrbd/ 8Ainle5y7zDc8tFdcr9gCsQ=
=K3FI
-----END PGP SIGNATURE-----
Quoted 7 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Op 01-11-12 02:42, Xin Ouyang schreef:
Quoted 3 lines
Git-Url: -
http://git.openembedded.org/openembedded/tree/recipes/netperf/
Quoted 6 lines
Quoted 4 lines
Signed-off-by Xin Ouyang <[email protected]> ---.../recipes-support/netperf/files/cpu_set.patch | 24 +++++++++ meta-networking/recipes-support/netperf/files/init | 51++++++++++++++++++++
The initscript is missing LSB headers and hardcodes $sbindir to
/usr/sbin.
The hardcodes would be fixed in V2.
But I think we do not need lsb headers, since no lsb init function used in the initscript.
Thanks.
- Pascal
Quoted 16 lines
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.orgiD8DBQFQk6XuMkyGM64RGpERApMQAJ0f0YMb53j54pjbXUpl7b6RCjWm7gCgrbd/ 8Ainle5y7zDc8tFdcr9gCsQ=
=K3FI
-----END PGP SIGNATURE-----_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
- Pascal
Op 6 nov. 2012 om 09:25 heeft Pascal Ouyang <[email protected]> het volgende geschreven:
Quoted 13 lines
Quoted 12 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Op 01-11-12 02:42, Xin Ouyang schreef:
Quoted 7 lines
Git-Url: -
http://git.openembedded.org/openembedded/tree/recipes/netperf/Signed-off-by Xin Ouyang <[email protected]> ---.../recipes-support/netperf/files/cpu_set.patch | 24 +++++++++ meta-networking/recipes-support/netperf/files/init | 51++++++++++++++++++++
Quoted 5 lines
Quoted 1 line
The initscript is missing LSB headers and hardcodes $sbindir to
/usr/sbin.The hardcodes would be fixed in V2.
But I think we do not need lsb headers, since no lsb init function used in the initscript.
You still need them for depency resolving and lsb compliance
Quoted 24 lines
Thanks.
- Pascal
Quoted 15 lines
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.orgiD8DBQFQk6XuMkyGM64RGpERApMQAJ0f0YMb53j54pjbXUpl7b6RCjWm7gCgrbd/ 8Ainle5y7zDc8tFdcr9gCsQ=
=K3FI
-----END PGP SIGNATURE-----_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-develSignature · 1 line
- Pascal