Skip to contentSkip to conversation

netperf: Update to latest

PATCH New Khem Raj 1 participant 2 messages Jul 21, 2021

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 netperf: Update to latest

License-Update: Upstream has switched to MIT [1]

[1] https://github.com/HewlettPackard/netperf/commit/2d88bcc75d97f462eafe8605f8da0c1f875b7dad

---
 meta-networking/recipes-support/netperf/netperf_git.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
meta-networking/recipes-support/netperf/netperf_git.bb +2 -3
index a084fb4c15..9d1e8df8e8 100644
@@ -2,8 +2,7 @@ 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"
+LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a0ab17253e7a3f318da85382c7d5d5d6"
 
 PV = "2.7.0+git${SRCPV}"
@@ -16,7 +15,7 @@ SRC_URI = "git://github.com/HewlettPackard/netperf.git \
            file://0001-nettest_omni-Remove-duplicate-variable-definitions.patch \
            "
 
-SRCREV = "f482bab49fcedee46fc5b755da127f608325cd13"
+SRCREV = "3bc455b23f901dae377ca0a558e1e32aa56b31c4"
 
 S = "${WORKDIR}/git"
 

--
2.32.0

author
#1 lore raw

PATCH 2/2 netperf: Add systemd unit file

---
 .../recipes-support/netperf/files/netserver.service  |  9 +++++++++
 .../recipes-support/netperf/netperf_git.bb           | 12 ++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 meta-networking/recipes-support/netperf/files/netserver.service
meta-networking/recipes-support/netperf/files/netserver.service new file +9 -0
new file mode 100644
index 0000000000..0876a0d223
@@ -0,0 +1,9 @@
+[Unit]
+Description=Netperf Benchmark Server
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/netserver -D
+
+[Install]
+WantedBy=multi-user.target
meta-networking/recipes-support/netperf/netperf_git.bb +8 -4
index 9d1e8df8e8..72efcb4f8a 100644
@@ -3,7 +3,7 @@ DESCRIPTION = "Network performance benchmark including tests for TCP, UDP, socke
 SECTION = "net"
 HOMEPAGE = "http://www.netperf.org/"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a0ab17253e7a3f318da85382c7d5d5d6"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e661ab33a2a71ad6652c178dedf8aaa2"
 
 PV = "2.7.0+git${SRCPV}"
 
@@ -11,6 +11,7 @@ SRC_URI = "git://github.com/HewlettPackard/netperf.git \
            file://cpu_set.patch \
            file://vfork.patch \
            file://init \
+           file://netserver.service \
            file://0001-netlib.c-Move-including-sched.h-out-og-function.patch \
            file://0001-nettest_omni-Remove-duplicate-variable-definitions.patch \
            "
@@ -19,7 +20,7 @@ SRCREV = "3bc455b23f901dae377ca0a558e1e32aa56b31c4"
 
 S = "${WORKDIR}/git"
 
-inherit update-rc.d autotools texinfo
+inherit update-rc.d autotools texinfo systemd
 
 # cpu_set.patch plus _GNU_SOURCE makes src/netlib.c compile with CPU_ macros
 CFLAGS_append = " -DDO_UNIX -DDO_IPV6 -D_GNU_SOURCE"
@@ -42,8 +43,10 @@ do_configure_prepend() {
 
 do_install() {
     sed -e 's#/usr/sbin/#${sbindir}/#g' -i ${WORKDIR}/init
-
-    install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d
+    install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d ${D}${systemd_system_unitdir}
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        sed -e 's#/usr/sbin/#${sbindir}/#g' ${WORKDIR}/netserver.service > ${D}${systemd_system_unitdir}/netserver.service
+    fi
     install -m 4755 src/netperf ${D}${bindir}
     install -m 4755 src/netserver ${D}${sbindir}
     install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/netperf
@@ -68,3 +71,4 @@ RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'sctp', 'kernel-modu
 
 INITSCRIPT_NAME="netperf"
 INITSCRIPT_PARAMS="defaults"
+SYSTEMD_SERVICE_${PN} = "netserver.service"

--
2.32.0