Patchwork [meta-oe] netperf: correct paths in the example scripts

login
register
mail settings
Submitter Christopher Larson
Date July 24, 2012, 5:55 p.m.
Message ID <1343152538-19215-1-git-send-email-kergoth@gmail.com>
Download mbox | patch
Permalink /patch/32953/
State Accepted
Commit 3b38fe66a86e4db8d5427dc600912c481b529372
Headers show

Comments

Christopher Larson - July 24, 2012, 5:55 p.m.
From: Christopher Larson <chris_larson@mentor.com>

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb |   10 ++++++++++
 1 file changed, 10 insertions(+)

Patch

diff --git a/meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb b/meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb
index 6a3a81c..15174ca 100644
--- a/meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb
+++ b/meta-oe/recipes-benchmark/netperf/netperf_2.4.4.bb
@@ -13,6 +13,8 @@  SRC_URI="ftp://ftp.netperf.org/netperf/archive/netperf-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "0e942f22864e601406a994420231075b"
 SRC_URI[sha256sum] = "28e76af491ea3696885e4558ae2f5628a4b9ebdbefc2f1d9cf1b35db2813e497"
 
+PR = "r1"
+
 inherit update-rc.d autotools
 
 S = "${WORKDIR}/netperf-${PV}"
@@ -20,6 +22,14 @@  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}