From 48433b13bf3a26e9ccb83bf8e7344ee3e37f6139 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 11 May 2011 15:12:19 -0700 Subject: lmbench: Rework for binaries in /usr/bin With the move to having lmbench binaries reside in /usr/bin both the lmbench-run script we provide as well as config-run and results from lmbench no longer work, so we need to fixup the paths in a few places. While in here, call install -d once to make all the directories we need and re-order stuff to flow better. Signed-off-by: Tom Rini --- .../lmbench-3.0-a9/update-results-script.patch | 155 +++++++++++++++++++++ recipes/lmbench/lmbench_3.0-a9.bb | 24 ++-- 2 files changed, 167 insertions(+), 12 deletions(-) create mode 100644 recipes/lmbench/lmbench-3.0-a9/update-results-script.patch (limited to 'recipes/lmbench') diff --git a/recipes/lmbench/lmbench-3.0-a9/update-results-script.patch b/recipes/lmbench/lmbench-3.0-a9/update-results-script.patch new file mode 100644 index 0000000000..3feb657d1b --- /dev/null +++ b/recipes/lmbench/lmbench-3.0-a9/update-results-script.patch @@ -0,0 +1,155 @@ +Now that we have our binaries in /usr/bin rather than the normal +lmbench hierarchy we need to update the scripts as well to bave well here. +Index: lmbench-3.0-a9/scripts/results +=================================================================== +--- lmbench-3.0-a9.orig/scripts/results ++++ lmbench-3.0-a9/scripts/results +@@ -8,11 +8,11 @@ RESULTS=results/$OS + BASE=../$RESULTS/`uname -n` + EXT=0 + +-if [ ! -f "../bin/$OS/$CONFIG" ] ++if [ ! -f "$CONFIG" ] + then echo "No config file?" + exit 1 + fi +-. ../bin/$OS/$CONFIG ++. $CONFIG + + if [ ! -d ../$RESULTS ] + then mkdir -p ../$RESULTS +@@ -23,11 +23,9 @@ do EXT=`expr $EXT + 1` + RESULTS=$BASE.$EXT + done + +-cd ../bin/$OS +-PATH=.:${PATH}; export PATH + export SYNC_MAX + export OUTPUT +-lmbench $CONFIG 2>../${RESULTS} ++lmbench $CONFIG 2>${RESULTS} + + if [ X$MAIL = Xyes ] + then echo Mailing results +Index: lmbench-3.0-a9/scripts/config-run +=================================================================== +--- lmbench-3.0-a9.orig/scripts/config-run ++++ lmbench-3.0-a9/scripts/config-run +@@ -132,20 +132,20 @@ export LMBENCH_SCHED + ############################################################################ + echo $L; echo ""; + echo "Hang on, we are calculating your timing granularity." +-../bin/$OS/msleep 250 +-ENOUGH=`../bin/$OS/enough` ++msleep 250 ++ENOUGH=`enough` + export ENOUGH + echo "OK, it looks like you can time stuff down to $ENOUGH usec resolution." + echo "" + echo "Hang on, we are calculating your timing overhead." +-../bin/$OS/msleep 250 +-TIMING_O=`../bin/$OS/timing_o` ++msleep 250 ++TIMING_O=`timing_o` + export TIMING_O + echo "OK, it looks like your gettimeofday() costs $TIMING_O usecs." + echo "" + echo "Hang on, we are calculating your loop overhead." +-../bin/$OS/msleep 250 +-LOOP_O=`../bin/$OS/loop_o` ++msleep 250 ++LOOP_O=`loop_o` + export LOOP_O + echo "OK, it looks like your benchmark loop costs $LOOP_O usecs." + echo "" +@@ -177,7 +177,7 @@ then + fi + if [ X$MB = X ] + then $ECHON "Probing system for available memory: $ECHOC" +- MB=`../bin/$OS/memsize 4096` ++ MB=`memsize 4096` + fi + TOTAL_MEM=$MB + MB=`echo \( $MB \* 7 \) / 10 | bc 2>/dev/null` +@@ -205,9 +205,9 @@ fi + # Certain machines tend to barf when you try and bcopy 8MB. + # Figure out how much we can use. + echo "Checking to see if you have $MB MB; please wait for a moment..." +-MB=`../bin/$OS/memsize $MB` +-MB=`../bin/$OS/memsize $MB` +-MB=`../bin/$OS/memsize $MB` ++MB=`memsize $MB` ++MB=`memsize $MB` ++MB=`memsize $MB` + if [ `expr $SYNC_MAX \* $MB` -gt `expr $TOTAL_MEM` ] + then + MB=`expr $TOTAL_MEM / $SYNC_MAX` +@@ -223,8 +223,8 @@ then echo Warning: you have only ${MB}MB + fi + + echo "Hang on, we are calculating your cache line size." +-../bin/$OS/msleep 250 +-LINE_SIZE=`../bin/$OS/lm_line -M ${MB}M` ++msleep 250 ++LINE_SIZE=`lm_line -M ${MB}M` + export LINE_SIZE + echo "OK, it looks like your cache line is $LINE_SIZE bytes." + echo "" +@@ -479,7 +479,7 @@ EOF + then + for i in $disks + do if [ -r $i ] +- then ../bin/$OS/flushdisk $i ++ then flushdisk $i + if [ $? -eq 1 ] + then echo "Must be root to run disk benchmarks." + echo "Root is needed to flush the buffer cache" +@@ -584,7 +584,7 @@ fi + echo $L + echo "" + echo "Calculating mhz, please wait for a moment..." +-MHZ=`../bin/$OS/mhz` ++MHZ=`mhz` + cat< $C + echo DISK_DESC=\"$DISK_DESC\" >> $C + echo OUTPUT=$OUTPUT >> $C diff --git a/recipes/lmbench/lmbench_3.0-a9.bb b/recipes/lmbench/lmbench_3.0-a9.bb index d1e9162bbe..ce6d1a80c0 100644 --- a/recipes/lmbench/lmbench_3.0-a9.bb +++ b/recipes/lmbench/lmbench_3.0-a9.bb @@ -3,13 +3,14 @@ DESCRIPTION = "Tools for performance analysis." LICENSE = "GPL" RDEPENDS_${PN} = "debianutils" -PR = "r3" +PR = "r4" inherit autotools SRC_URI = "${SOURCEFORGE_MIRROR}/lmbench/lmbench-${PV}.tgz \ file://lmbench-run \ - file://rename-line-binary.patch" + file://rename-line-binary.patch \ + file://update-results-script.patch" SRC_URI[md5sum] = "b3351a3294db66a72e2864a199d37cbf" SRC_URI[sha256sum] = "cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551" @@ -40,24 +41,23 @@ do_compile () { fi install -d ${S}/bin/${TARGET_SYS} oe_runmake -C src - sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${PN},;' \ - -e 's,^BINDIR=.*$,BINDIR=${libdir}/${PN},;' ${WORKDIR}/lmbench-run } do_install () { - mkdir -p ${D}${libdir}/lmbench + install -d ${D}${localstatedir}/run/lmbench \ + ${D}${bindir} ${D}${mandir} ${D}${libdir}/lmbench \ + ${D}${datadir}/lmbench/scripts oe_runmake 'BASE=${D}${prefix}' \ -C src install - install -d ${D}${localstatedir}/lib/lmbench/config \ - ${D}${localstatedir}/run/lmbench \ - ${D}${bindir} - install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/ - mkdir -p ${D}${mandir} + mv ${D}${bindir}/line ${D}${bindir}/lm_line mv ${D}${prefix}/man/* ${D}${mandir}/ + install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/ + sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${PN},;' \ + -e 's,^BINDIR=.*$,BINDIR=${libdir}/${PN},;' \ + -e 's,^CONFIG=.*$,CONFIG=$SHAREDIR/`$SCRIPTSDIR/config`,;' \ + ${D}${bindir}/lmbench-run install -m 0755 ${S}/scripts/lmbench ${D}${bindir} - install -d ${D}${datadir}/lmbench/scripts install -m 0755 ${S}/scripts/* ${D}${datadir}/lmbench/scripts - mv ${D}${bindir}/line ${D}${bindir}/lm_line } FILES_${PN} += "${datadir}/lmbench" -- cgit 1.2.3-korg