From 2c731d47508a6bbfff32f98aa52f02dd671e4215 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Wed, 20 Jun 2012 13:36:11 -0400 Subject: [PATCH] netperf: Use the one we build. Signed-off-by: Konrad Rzeszutek Wilk --- root_image/Makefile | 2 +- root_image/debugspace/www/cgi-bin/netperf | 2 +- root_image/etc/init.d/rcS | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/root_image/Makefile b/root_image/Makefile index 054a250..3c1272e 100644 --- a/root_image/Makefile +++ b/root_image/Makefile @@ -191,7 +191,7 @@ distdir: #root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins add-debug-bins tools-install wget-install vim-install rsync-install openssh-install xtt-tools-install netperf-install lvm2-install plymouth-install pciutils-install iscsi-install bridge-utils-install xend-install nfs-install fio-install directfb-install irqbalance-install pm-utils-install cpufrequtils-install kexec-tools-install -root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins tools-install +root_image-userspace-install: $(USERSPACE_INSTALL) add-libs add-bins tools-install netperf-install rm -rf userspace/man rm -rf userspace/usr/share/man rm -rf userspace/usr/share/doc diff --git a/root_image/debugspace/www/cgi-bin/netperf b/root_image/debugspace/www/cgi-bin/netperf index aaab158..34811b7 100755 --- a/root_image/debugspace/www/cgi-bin/netperf +++ b/root_image/debugspace/www/cgi-bin/netperf @@ -4,7 +4,7 @@ echo Content-type: text/html echo "" X=$(date "+%s") eval $QUERY_STRING -/netperf -H $H -l $L +/usr/bin/netperf -H $H -l $L Y=$(date "+%s") echo $X $Y diff --git a/root_image/etc/init.d/rcS b/root_image/etc/init.d/rcS index ac4cac1..973c4ee 100755 --- a/root_image/etc/init.d/rcS +++ b/root_image/etc/init.d/rcS @@ -9,6 +9,6 @@ let I=0x$X let J=0x$Y /sbin/ifconfig eth0 $J.0.0.$I -/netserver +/usr/bin/netserver /usr/sbin/httpd -h /www & -- 2.39.5