From 6af98c4cc234a0ad688719e3868159994e9c3fd6 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 30 Aug 2017 17:28:11 +0800 Subject: netperf: upgrade to 2.7.0+ with git version The homepage of netperf has been moved to github. The original webpage www.netperf.org is redirected to github and tarballs are removed. So use git version of recipe instead. netperf 2.7.0 was released in July 2015 which is too old. So upgrade to latest commit of git repo which is on Nov 29, 2016. Signed-off-by: Kai Kang Signed-off-by: Martin Jansa --- .../recipes-support/netperf/netperf_2.6.0.bb | 66 ---------------------- .../recipes-support/netperf/netperf_git.bb | 66 ++++++++++++++++++++++ 2 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 meta-networking/recipes-support/netperf/netperf_2.6.0.bb create mode 100644 meta-networking/recipes-support/netperf/netperf_git.bb diff --git a/meta-networking/recipes-support/netperf/netperf_2.6.0.bb b/meta-networking/recipes-support/netperf/netperf_2.6.0.bb deleted file mode 100644 index 650fdaeedb..0000000000 --- a/meta-networking/recipes-support/netperf/netperf_2.6.0.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "A networking benchmarking tool" -DESCRIPTION = "Network performance benchmark including tests for TCP, UDP, sockets, ATM and more." -SECTION = "net" -HOMEPAGE = "http://www.netperf.org/" -LICENSE = "netperf" -LICENSE_FLAGS = "non-commercial" - - -SRC_URI="ftp://ftp.netperf.org/netperf/archive/netperf-${PV}.tar.bz2 \ - file://cpu_set.patch \ - file://vfork.patch \ - file://init" -SRC_URI[md5sum] = "9654ffdfd4c4f2c93ce3733cd9ed9236" -SRC_URI[sha256sum] = "cd8dac710d4273d29f70e8dbd09353a6362ac58a11926e0822233c0cb230323a" - -LIC_FILES_CHKSUM = "file://COPYING;md5=a0ab17253e7a3f318da85382c7d5d5d6" - -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" - -# set the "_FILE_OFFSET_BITS" preprocessor symbol to 64 to support files -# larger than 2GB -CFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', \ - ' -D_FILE_OFFSET_BITS=64', '', d)}" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[sctp] = "--enable-sctp,--disable-sctp,lksctp-tools," - -# 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 ${S}/m4/m4 && mv -f ${S}/m4/m4 ${S}/m4-files -} - -do_install() { - sed -e 's#/usr/sbin/#${sbindir}/#g' -i ${WORKDIR}/init - - 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 ${S}/doc/netserver.man ${D}${mandir}/man1/netserver.1 - install -m 0644 ${S}/doc/netperf.man ${D}${mandir}/man1/netperf.1 - - # move scripts to examples directory - install -d ${D}${docdir}/netperf/examples - install -m 0644 ${S}/doc/examples/*_script ${D}${docdir}/netperf/examples/ - - # docs .. - install -m 0644 ${S}/COPYING ${D}${docdir}/netperf - install -m 0644 ${S}/Release_Notes ${D}${docdir}/netperf - install -m 0644 ${S}/README ${D}${docdir}/netperf - install -m 0644 ${S}/doc/netperf_old.ps ${D}${docdir}/netperf -} - -RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}" - -INITSCRIPT_NAME="netperf" -INITSCRIPT_PARAMS="defaults" diff --git a/meta-networking/recipes-support/netperf/netperf_git.bb b/meta-networking/recipes-support/netperf/netperf_git.bb new file mode 100644 index 0000000000..f0e0f9cf1f --- /dev/null +++ b/meta-networking/recipes-support/netperf/netperf_git.bb @@ -0,0 +1,66 @@ +SUMMARY = "A networking benchmarking tool" +DESCRIPTION = "Network performance benchmark including tests for TCP, UDP, sockets, ATM and more." +SECTION = "net" +HOMEPAGE = "http://www.netperf.org/" +LICENSE = "netperf" +LICENSE_FLAGS = "non-commercial" +LIC_FILES_CHKSUM = "file://COPYING;md5=a0ab17253e7a3f318da85382c7d5d5d6" + +PV = "2.7.0+git${SRCPV}" + +SRC_URI="git://github.com/HewlettPackard/netperf.git \ + file://cpu_set.patch \ + file://vfork.patch \ + file://init" + +SRCREV = "f482bab49fcedee46fc5b755da127f608325cd13" + +S = "${WORKDIR}/git" + +inherit update-rc.d autotools + +# cpu_set.patch plus _GNU_SOURCE makes src/netlib.c compile with CPU_ macros +CFLAGS_append = " -DDO_UNIX -DDO_IPV6 -D_GNU_SOURCE" + +# set the "_FILE_OFFSET_BITS" preprocessor symbol to 64 to support files +# larger than 2GB +CFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', \ + ' -D_FILE_OFFSET_BITS=64', '', d)}" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[sctp] = "--enable-sctp,--disable-sctp,lksctp-tools," + +# 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 ${S}/m4/m4 && mv -f ${S}/m4/m4 ${S}/m4-files +} + +do_install() { + sed -e 's#/usr/sbin/#${sbindir}/#g' -i ${WORKDIR}/init + + 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 ${S}/doc/netserver.man ${D}${mandir}/man1/netserver.1 + install -m 0644 ${S}/doc/netperf.man ${D}${mandir}/man1/netperf.1 + + # move scripts to examples directory + install -d ${D}${docdir}/netperf/examples + install -m 0644 ${S}/doc/examples/*_script ${D}${docdir}/netperf/examples/ + + # docs .. + install -m 0644 ${S}/COPYING ${D}${docdir}/netperf + install -m 0644 ${S}/Release_Notes ${D}${docdir}/netperf + install -m 0644 ${S}/README ${D}${docdir}/netperf + install -m 0644 ${S}/doc/netperf_old.ps ${D}${docdir}/netperf +} + +RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}" + +INITSCRIPT_NAME="netperf" +INITSCRIPT_PARAMS="defaults" -- cgit 1.2.3-korg