org.handhelds.familiar/packages/lmbench/lmbench-2.0.4/debian.patch

   1 Binary files lmbench-2.0.4.old/bin/arm-linux/bw_file_rd and lmbench-2.0.4/bin/arm-linux/bw_file_rd differ
   2 Binary files lmbench-2.0.4.old/bin/arm-linux/bw_mem and lmbench-2.0.4/bin/arm-linux/bw_mem differ
   3 Binary files lmbench-2.0.4.old/bin/arm-linux/bw_mmap_rd and lmbench-2.0.4/bin/arm-linux/bw_mmap_rd differ
   4 Binary files lmbench-2.0.4.old/bin/arm-linux/bw_pipe and lmbench-2.0.4/bin/arm-linux/bw_pipe differ
   5 Binary files lmbench-2.0.4.old/bin/arm-linux/bw_tcp and lmbench-2.0.4/bin/arm-linux/bw_tcp differ
   6 Binary files lmbench-2.0.4.old/bin/arm-linux/bw_unix and lmbench-2.0.4/bin/arm-linux/bw_unix differ
   7 Binary files lmbench-2.0.4.old/bin/arm-linux/clock and lmbench-2.0.4/bin/arm-linux/clock differ
   8 Binary files lmbench-2.0.4.old/bin/arm-linux/disk and lmbench-2.0.4/bin/arm-linux/disk differ
   9 Binary files lmbench-2.0.4.old/bin/arm-linux/enough and lmbench-2.0.4/bin/arm-linux/enough differ
  10 Binary files lmbench-2.0.4.old/bin/arm-linux/flushdisk and lmbench-2.0.4/bin/arm-linux/flushdisk differ
  11 Binary files lmbench-2.0.4.old/bin/arm-linux/hello and lmbench-2.0.4/bin/arm-linux/hello differ
  12 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_connect and lmbench-2.0.4/bin/arm-linux/lat_connect differ
  13 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_ctx and lmbench-2.0.4/bin/arm-linux/lat_ctx differ
  14 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_fcntl and lmbench-2.0.4/bin/arm-linux/lat_fcntl differ
  15 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_fifo and lmbench-2.0.4/bin/arm-linux/lat_fifo differ
  16 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_fs and lmbench-2.0.4/bin/arm-linux/lat_fs differ
  17 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_http and lmbench-2.0.4/bin/arm-linux/lat_http differ
  18 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_mem_rd and lmbench-2.0.4/bin/arm-linux/lat_mem_rd differ
  19 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_mmap and lmbench-2.0.4/bin/arm-linux/lat_mmap differ
  20 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_pagefault and lmbench-2.0.4/bin/arm-linux/lat_pagefault differ
  21 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_pipe and lmbench-2.0.4/bin/arm-linux/lat_pipe differ
  22 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_proc and lmbench-2.0.4/bin/arm-linux/lat_proc differ
  23 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_rpc and lmbench-2.0.4/bin/arm-linux/lat_rpc differ
  24 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_select and lmbench-2.0.4/bin/arm-linux/lat_select differ
  25 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_sig and lmbench-2.0.4/bin/arm-linux/lat_sig differ
  26 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_syscall and lmbench-2.0.4/bin/arm-linux/lat_syscall differ
  27 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_tcp and lmbench-2.0.4/bin/arm-linux/lat_tcp differ
  28 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_udp and lmbench-2.0.4/bin/arm-linux/lat_udp differ
  29 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_unix and lmbench-2.0.4/bin/arm-linux/lat_unix differ
  30 Binary files lmbench-2.0.4.old/bin/arm-linux/lat_unix_connect and lmbench-2.0.4/bin/arm-linux/lat_unix_connect differ
  31 Binary files lmbench-2.0.4.old/bin/arm-linux/lib_stats.o and lmbench-2.0.4/bin/arm-linux/lib_stats.o differ
  32 Binary files lmbench-2.0.4.old/bin/arm-linux/lib_tcp.o and lmbench-2.0.4/bin/arm-linux/lib_tcp.o differ
  33 Binary files lmbench-2.0.4.old/bin/arm-linux/lib_timing.o and lmbench-2.0.4/bin/arm-linux/lib_timing.o differ
  34 Binary files lmbench-2.0.4.old/bin/arm-linux/lib_udp.o and lmbench-2.0.4/bin/arm-linux/lib_udp.o differ
  35 Binary files lmbench-2.0.4.old/bin/arm-linux/lib_unix.o and lmbench-2.0.4/bin/arm-linux/lib_unix.o differ
  36 Binary files lmbench-2.0.4.old/bin/arm-linux/lmbench.a and lmbench-2.0.4/bin/arm-linux/lmbench.a differ
  37 Binary files lmbench-2.0.4.old/bin/arm-linux/lmdd and lmbench-2.0.4/bin/arm-linux/lmdd differ
  38 Binary files lmbench-2.0.4.old/bin/arm-linux/lmhttp and lmbench-2.0.4/bin/arm-linux/lmhttp differ
  39 Binary files lmbench-2.0.4.old/bin/arm-linux/loop_o and lmbench-2.0.4/bin/arm-linux/loop_o differ
  40 Binary files lmbench-2.0.4.old/bin/arm-linux/memsize and lmbench-2.0.4/bin/arm-linux/memsize differ
  41 Binary files lmbench-2.0.4.old/bin/arm-linux/mhz and lmbench-2.0.4/bin/arm-linux/mhz differ
  42 Binary files lmbench-2.0.4.old/bin/arm-linux/msleep and lmbench-2.0.4/bin/arm-linux/msleep differ
  43 Binary files lmbench-2.0.4.old/bin/arm-linux/timing_o and lmbench-2.0.4/bin/arm-linux/timing_o differ
  44 diff -urNd -urNd lmbench-2.0.4.old/doc/lmbench.8 lmbench-2.0.4/doc/lmbench.8
  45 --- lmbench-2.0.4.old/doc/lmbench.8     2003-01-13 06:24:22.000000000 -0500
  46 +++ lmbench-2.0.4/doc/lmbench.8 2004-05-12 18:13:11.000000000 -0400
  47 @@ -8,7 +8,7 @@
  48  system and hardware system metrics.  The benchmarks fall into three
  49  general classes: bandwidth, latency, and ``other''.
  50  .SH BANDWIDTH MEASUREMENTS
  51 -Data movement is fundemental to the performance on most computer systems.
  52 +Data movement is fundamental to the performance on most computer systems.
  53  The bandwidth measurements are intended to show how the system can move
  54  data.  The results of the bandwidth metrics can be compared but care
  55  must be taken to understand what it is that is being compared.  The
  56 @@ -40,7 +40,7 @@
  57  bw_tcp
  58  reading of data via a TCP/IP socket.
  59  .SH LATENCY MEASUREMENTS
  60 -Control messages are also fundemental to the performance on most
  61 +Control messages are also fundamental to the performance on most
  62  computer systems.  The latency measurements are intended to show how fast
  63  a system can be told to do some operation.  The results of the
  64  latency metrics can be compared to each other
  65 @@ -115,11 +115,16 @@
  66  The benchmarking code is distributed under the GPL with additional
  67  restrictions, see the COPYING file.
  68  .SH "SEE ALSO"
  69 -lmbench(3), timing(3), results(3), reporting(3),
  70 -bargraph(1), graph(1), pgraph(1),
  71 -disk(8), clock(8), enough(8), timing_o(8), loop_o(8),
  72 +lmbench(3),
  73  bw_file_rd(8), bw_mem(8), bw_mmap_rd(8), bw_pipe(8), bw_unix(8),
  74  lat_connect(8), lat_ctx(8), lat_fcntl(8), lat_fifo(8), lat_fs(8),
  75  lat_http(8), lat_mem_rd(8), lat_mmap(8), lat_pagefault(8),
  76  lat_pipe(8), lat_proc(8), lat_rpc(8), lat_select(8), lat_syscall(8),
  77  lat_tcp(8), lat_udp(8), lat_unix(8), lat_unix_connect(8).
  78 +.P
  79 +In Debian GNU/linux systems the following manpages have been
  80 +removed due to conflicts with other programs, if you want to
  81 +read them, please download the package sources.
  82 +timing(3), results(3), reporting(3),
  83 +bargraph(1), graph(1), pgraph(1),
  84 +disk(8), clock(8), enough(8), timing_o(8), loop_o(8),
  85 diff -urNd -urNd lmbench-2.0.4.old/doc/lmbench.8~debian.patch lmbench-2.0.4/doc/lmbench.8~debian.patch
  86 diff -urNd -urNd lmbench-2.0.4.old/Makefile lmbench-2.0.4/Makefile
  87 --- lmbench-2.0.4.old/Makefile  2003-01-13 06:24:22.000000000 -0500
  88 +++ lmbench-2.0.4/Makefile      2004-05-12 18:14:38.000000000 -0400
  89 @@ -15,6 +15,13 @@
  90  # shar         build a shippable shar archive
  91
  92  SHELL=/bin/sh
  93 +PREFIX=/usr/local
  94 +PACKAGE=lmbench
  95 +SHAREDIR=${PREFIX}/share/${PACKAGE}/
  96 +CONFIGDIR=${SHAREDIR}/config
  97 +RESULTSDIR=${SHAREDIR}/results
  98 +SCRIPTSDIR=${SHAREDIR}/scripts
  99 +BINDIR=${PREFIX}/bin/
 100
 101  build:
 102         cd src && $(MAKE)
 103 @@ -70,4 +77,20 @@
 104         find lmbench -type f -print  | egrep -v 'noship|RCS' > /tmp/FILES
 105         cd .. && shar -S -a -n lmbench1.0 -L 50K < /tmp/FILES
 106
 107 +install:
 108 +       install -d -m 755 ${RESULTSDIR}
 109 +       install -d -m 755 ${SCRIPTSDIR}
 110 +       install -d -m 755 ${CONFIGDIR}
 111 +       install -d -m 755 ${BINDIR}
 112 +       for i in `find scripts -type f -print | egrep -v 's\.|TODO|READ|Make|noship|RCS|\.o|\.a'`; do \
 113 +               install -m 755 $$i ${SCRIPTSDIR} ; \
 114 +       done
 115 +       install -m 644 scripts/README ${SCRIPTSDIR}
 116 +       install -m 644 scripts/TODO ${SCRIPTSDIR}
 117 +       install -m 644 src/bk.ver ${SHAREDIR}
 118 +       tar -C ${SHAREDIR} -xf src/webpage-lm.tar
 119 +       for i in `find bin -type f -print | egrep -v 's\.|noship|RCS|\.o|\.a'`; do \
 120 +               install -m 755 $$i ${BINDIR} ; \
 121 +       done
 122 +
 123  FRC:
 124 diff -urNd -urNd lmbench-2.0.4.old/Makefile~debian.patch lmbench-2.0.4/Makefile~debian.patch
 125 diff -urNd -urNd lmbench-2.0.4.old/.patches/applied lmbench-2.0.4/.patches/applied
 126 diff -urNd -urNd lmbench-2.0.4.old/.patches/debian.patch.files lmbench-2.0.4/.patches/debian.patch.files
 127 diff -urNd -urNd lmbench-2.0.4.old/.patches/debian.patch.patch lmbench-2.0.4/.patches/debian.patch.patch
 128 diff -urNd -urNd lmbench-2.0.4.old/.patches/series lmbench-2.0.4/.patches/series
 129 diff -urNd -urNd lmbench-2.0.4.old/README lmbench-2.0.4/README
 130 --- lmbench-2.0.4.old/README    2003-01-13 06:24:22.000000000 -0500
 131 +++ lmbench-2.0.4/README        2004-05-12 18:13:11.000000000 -0400
 132 @@ -1,3 +1,21 @@
 133 +
 134 +There is a mailing list to discuss this project.  It is "lmbench-users"
 135 +and you get on it by sending mail to majordomo@bitmover.com .
 136 +
 137 +There is a web page with an overview, see
 138 +
 139 +       http://www.bitmover.com/lmbench
 140 +
 141 +Enjoy.
 142 +
 143 +-------------------------------------------------------------------------------
 144 +
 145 +Notes
 146 +-----
 147 +
 148 +lmbench-2.0  - current stable release
 149 +
 150 +
 151  README for lmbench 2alpha8 net release.
 152
 153  To run the benchmark, you should be able to say:
 154 @@ -21,3 +39,5 @@
 155         make rerun
 156         make rerun
 157         cd Results && make LIST=<your OS>/*
 158 +This is the FTP site for the lmbench benchmarking system.
 159 +
 160 diff -urNd -urNd lmbench-2.0.4.old/README~debian.patch lmbench-2.0.4/README~debian.patch
 161 diff -urNd -urNd lmbench-2.0.4.old/scripts/build lmbench-2.0.4/scripts/build
 162 --- lmbench-2.0.4.old/scripts/build     2003-01-13 06:24:22.000000000 -0500
 163 +++ lmbench-2.0.4/scripts/build 2004-05-12 18:17:32.000000000 -0400
 164 @@ -9,6 +9,7 @@
 165  NULL=/dev/null
 166  BASE=/tmp/dummy
 167
 168 +echo "build: OS is $OS, MAKE is $MAKE, TARGET is $TARGET, BINDIR is $BINDIR, CONFIG is $CONFIG"
 169
 170  trap 'rm -f ${BASE}$$.s ${BASE}$$.c ${BASE}$$.o ${BASE}$$; exit 1' 1 2 15
 171
 172 diff -urNd -urNd lmbench-2.0.4.old/scripts/config-run lmbench-2.0.4/scripts/config-run
 173 --- lmbench-2.0.4.old/scripts/config-run        2003-01-13 06:24:22.000000000 -0500
 174 +++ lmbench-2.0.4/scripts/config-run    2004-05-12 18:13:11.000000000 -0400
 175 @@ -3,7 +3,15 @@
 176  # Configure parameters for lmbench.
 177  # %I% %E% %@%
 178
 179 -OS=`../scripts/os`
 180 +SHAREDIR=/usr/share/lmbench
 181 +VARDIR=/var/lib/lmbench
 182 +CONFIGDIR=$VARDIR/config
 183 +SCRIPTSDIR=$SHAREDIR/scripts
 184 +OS=`$SCRIPTSDIR/os`
 185 +# Original:
 186 +# SHAREDIR=../scripts/
 187 +# BINDIR=../bin/$OS/
 188 +BINDIR=/usr/lib/lmbench
 189  L='====================================================================='
 190  echo $L;
 191  cat<<EOF;
 192 @@ -36,20 +44,20 @@
 193  ############################################################################
 194  echo $L; echo "";
 195  echo "Hang on, we are calculating your timing granularity."
 196 -../bin/$OS/msleep 250
 197 -ENOUGH=`../bin/$OS/enough`
 198 +$BINDIR/msleep 250
 199 +ENOUGH=`$BINDIR/enough`
 200  export ENOUGH
 201  echo "OK, it looks like you can time stuff down to $ENOUGH usec resolution."
 202  echo ""
 203  echo "Hang on, we are calculating your timing overhead."
 204 -../bin/$OS/msleep 250
 205 -TIMING_O=`../bin/$OS/timing_o`
 206 +$BINDIR/msleep 250
 207 +TIMING_O=`$BINDIR/timing_o`
 208  export TIMING_O
 209  echo "OK, it looks like your gettimeofday() costs $TIMING_O usecs."
 210  echo ""
 211  echo "Hang on, we are calculating your loop overhead."
 212 -../bin/$OS/msleep 250
 213 -LOOP_O=`../bin/$OS/loop_o`
 214 +$BINDIR/msleep 250
 215 +LOOP_O=`$BINDIR/loop_o`
 216  export LOOP_O
 217  echo "OK, it looks like your benchmark loop costs $LOOP_O usecs."
 218  echo ""
 219 @@ -98,9 +106,9 @@
 220  # Certain machines tend to barf when you try and bcopy 8MB.
 221  # Figure out how much we can use.
 222  echo "Checking to see if you have $MB MB; please wait for a moment..."
 223 -AVAILMEM=`../bin/$OS/memsize $MB`
 224 -AVAILMEM=`../bin/$OS/memsize $MB`
 225 -AVAILMEM=`../bin/$OS/memsize $MB`
 226 +AVAILMEM=`$BINDIR/memsize $MB`
 227 +AVAILMEM=`$BINDIR/memsize $MB`
 228 +AVAILMEM=`$BINDIR/memsize $MB`
 229  if [ $AVAILMEM -lt 8 ]
 230  then    echo $0 aborted: Not enough memory, only ${AVAILMEM}MB available.
 231         exit 1
 232 @@ -194,7 +202,7 @@
 233  then
 234         for i in $disks
 235         do      if [ -r $i ]
 236 -               then    ../bin/$OS/flushdisk $i
 237 +               then    $BINDIR/flushdisk $i
 238                         if [ $? -eq 1 ]
 239                         then    echo "Must be root to run disk benchmarks."
 240                                 echo "Root is needed to flush the buffer cache"
 241 @@ -215,7 +223,7 @@
 242  echo $L
 243  echo ""
 244  echo "Calculating mhz, please wait for a moment..."
 245 -MHZ=`../bin/$OS/mhz`
 246 +MHZ=`$BINDIR/mhz`
 247  cat<<EOF
 248  I think your CPU mhz is
 249
 250 @@ -236,7 +244,7 @@
 251
 252
 253  ############################################################################
 254 -# /usr/tmp?
 255 +# /tmp?
 256  ############################################################################
 257  echo $L
 258  AGAIN=Y
 259 @@ -245,19 +253,13 @@
 260         cat<<EOF;
 261
 262  We need a place to store a $MB Mbyte file as well as create and delete a
 263 -large number of small files.  We default to /usr/tmp.  If /usr/tmp is a
 264 +large number of small files.  We default to /tmp.  If /tmp is a
 265  memory resident file system (i.e., tmpfs), pick a different place.
 266  Please specify a directory that has enough space and is a local file
 267  system.
 268
 269  EOF
 270 -       DEFAULTFSDIR=/usr/tmp
 271 -       for t in /usr/tmp /tmp /var/tmp; do
 272 -               if [ -d $t -a -w $t ]
 273 -               then    DEFAULTFSDIR=$t
 274 -                       break
 275 -               fi
 276 -       done
 277 +       DEFAULTFSDIR=/tmp
 278         echo $ECHON "FSDIR [default $DEFAULTFSDIR] $ECHOC"
 279         read FSDIR
 280         if [ X$FSDIR = X ]
 281 @@ -398,11 +400,11 @@
 282                 ;;
 283  esac
 284
 285 -INFO=`../scripts/info`
 286 +INFO=`$SCRIPTSDIR/info`
 287  if [ $MAIL = yes ]
 288 -then   if [ ! -f ../bin/$OS/$INFO ]
 289 -       then    cp ../scripts/info-template ../bin/$OS/$INFO
 290 -               chmod +w ../bin/$OS/$INFO
 291 +then   if [ ! -f $CONFIGDIR/$INFO ]
 292 +       then    cp $SCRIPTSDIR/info-template $CONFIGDIR/$INFO
 293 +               chmod +w $CONFIGDIR/$INFO
 294                 REUSE=no
 295         else
 296                 REUSE=view
 297 @@ -416,7 +418,7 @@
 298                                 ;;
 299                         [Vv]*)  REUSE=view
 300                                 echo $L
 301 -                               more ../bin/$OS/$INFO
 302 +                               more $CONFIDIR/$INFO
 303                                 echo $L
 304                                 ;;
 305                         *)      REUSE=yes
 306 @@ -444,7 +446,7 @@
 307                 then    EDITOR=$TMP
 308                 fi
 309                 if [ X$EDITOR != "none" ]
 310 -               then    $EDITOR ../bin/$OS/`../scripts/info`
 311 +               then    $EDITOR $CONFIGDIR/`$SCRIPTSDIR/info`
 312                 fi
 313         fi
 314  fi
 315 @@ -459,9 +461,14 @@
 316
 317  EOF
 318
 319 -VERSION=`../scripts/version`
 320 +VERSION=`$SCRIPTSDIR/version`
 321
 322 -C=../bin/$OS/`../scripts/config`
 323 +C=$CONFIGDIR/`$SCRIPTSDIR/config`
 324 +> "$C"
 325 +[ ! -f "$C" ]  && {
 326 +       echo "Config file not created, error in the script"
 327 +       exit 1
 328 +}
 329  echo DISKS=\"$DISKS\"\; export DISKS > $C
 330  echo DISK_DESC=\"$DISK_DESC\"\; export DISK_DESC >> $C
 331  echo OUTPUT=$OUTPUT\; export OUTPUT >> $C
 332 diff -urNd -urNd lmbench-2.0.4.old/scripts/config-run~debian.patch lmbench-2.0.4/scripts/config-run~debian.patch
 333 diff -urNd -urNd lmbench-2.0.4.old/scripts/gnu-os lmbench-2.0.4/scripts/gnu-os
 334 --- lmbench-2.0.4.old/scripts/gnu-os    2003-01-13 06:24:22.000000000 -0500
 335 +++ lmbench-2.0.4/scripts/gnu-os        2004-05-12 18:13:11.000000000 -0400
 336 @@ -35,6 +35,7 @@
 337  # don't specify an explicit build system type.
 338
 339  me=`echo "$0" | sed -e 's,.*/,,'`
 340 +RUNDIR=/var/run/lmbench/
 341
 342  usage="\
 343  Usage: $0 [OPTION]
 344 @@ -87,8 +88,9 @@
 345    exit 1
 346  fi
 347
 348 -
 349 -dummy=dummy-$$
 350 +cd $RUNDIR
 351 +dummy=`tempfile -d .`
 352 +#dummy=dummy-$$
 353  trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
 354
 355  # CC_FOR_BUILD -- compiler used by this script.
 356 @@ -206,7 +208,7 @@
 357  EOF
 358         $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 359         if test "$?" = 0 ; then
 360 -               case `./$dummy` in
 361 +               case `$dummy` in
 362                         0-0)
 363                                 UNAME_MACHINE="alpha"
 364                                 ;;
 365 diff -urNd -urNd lmbench-2.0.4.old/scripts/gnu-os~debian.patch lmbench-2.0.4/scripts/gnu-os~debian.patch
 366 diff -urNd -urNd lmbench-2.0.4.old/scripts/lmbench lmbench-2.0.4/scripts/lmbench
 367 --- lmbench-2.0.4.old/scripts/lmbench   2003-01-13 06:24:22.000000000 -0500
 368 +++ lmbench-2.0.4/scripts/lmbench       2004-05-12 18:13:11.000000000 -0400
 369 @@ -7,7 +7,11 @@
 370  # $Id$
 371
 372  # Make sure we can find: ./cmd, df, and netstat
 373 -PATH=.:../../scripts:$PATH:/etc:/usr/etc:/sbin:/usr/sbin
 374 +#SCRIPTDIR=../../scripts
 375 +SHAREDIR=/usr/share/lmbench/
 376 +LIBDIR=/usr/lib/lmbench/
 377 +SCRIPTDIR=$SHAREDIR/scripts
 378 +PATH=.:$SHAREDIR:$PATH:/etc:/usr/etc:/sbin:/usr/sbin
 379  export PATH
 380
 381  if [ -f $1 ]
 382 @@ -51,7 +55,7 @@
 383  # Figure out as much stuff as we can about this system.
 384  # Sure would be nice if everyone had SGI's "hinv".
 385  echo \[lmbench2.0 results for `uname -a`] 1>&2
 386 -echo \[LMBENCH_VER: `cat ../../src/bk.ver`] 1>&2
 387 +echo \[LMBENCH_VER: `cat $SHAREDIR/bk.ver`] 1>&2
 388  echo \[ALL: ${ALL}] 1>&2
 389  echo \[DISKS: ${DISKS}] 1>&2
 390  echo \[DISK_DESC: ${DISK_DESC}] 1>&2
 391 @@ -154,14 +158,14 @@
 392
 393  date >> ${OUTPUT}
 394  echo Local networking >> ${OUTPUT}
 395 -if [ ! -d ../../src/webpage-lm ]
 396 -then   (cd ../../src && tar xf webpage-lm.tar)
 397 +if [ ! -d $SHAREDIR/webpage-lm ]
 398 +then   (cd $SHAREDIR && tar xf webpage-lm.tar)
 399         sync
 400         sleep 1
 401  fi
 402  SERVERS="lat_udp lat_tcp lat_rpc lat_connect bw_tcp"
 403  for server in $SERVERS; do $server -s; done
 404 -DOCROOT=../../src/webpage-lm lmhttp 8008 &
 405 +DOCROOT=$SHAREDIR/webpage-lm lmhttp 8008 &
 406  sleep 2;
 407  for i in localhost
 408  do
 409 @@ -176,18 +180,18 @@
 410         bw_tcp $i
 411         bw_tcp -$i
 412         # I want a hot cache number
 413 -       lat_http $i 8008 < ../../src/webpage-lm/URLS > /dev/null 2>&1
 414 -       lat_http $i 8008 < ../../src/webpage-lm/URLS
 415 +       lat_http $i 8008 < $SHAREDIR/webpage-lm/URLS > /dev/null 2>&1
 416 +       lat_http $i 8008 < $SHAREDIR/webpage-lm/URLS
 417         lat_http -$i 8008
 418  done
 419
 420  for remote in $REMOTE
 421  do     echo Networking to $remote >> ${OUTPUT}
 422 -       $RCP $SERVERS lmhttp ../../src/webpage-lm.tar ${remote}:/tmp
 423 +       $RCP $SERVERS lmhttp $SHAREDIR/webpage-lm.tar ${remote}:/tmp
 424         for server in $SERVERS
 425         do      $RSH $remote -n /tmp/$server -s &
 426         done
 427 -       $RSH $remote -n 'cd /tmp; tar xf webpage-lm.tar; cd webpage-lm; ../lmhttp 8008' &
 428 +       $RSH $remote -n 'cd /tmp; tar xf webpage-lm.tar; cd webpage-lm; $LIBDIR/lmhttp 8008' &
 429         sleep 10
 430         echo "[ Networking remote to $remote: `$RSH $remote uname -a` ]" 1>&2
 431         lat_udp $remote; lat_udp -$remote;
 432 @@ -196,8 +200,8 @@
 433         lat_connect $remote; lat_connect -$remote;
 434         bw_tcp $remote; bw_tcp -$remote
 435         # I want a hot cache number
 436 -       lat_http $remote 8008 < ../../src/webpage-lm/URLS > /dev/null 2>&1
 437 -       lat_http $remote 8008 < ../../src/webpage-lm/URLS
 438 +       lat_http $remote 8008 < $SHAREDIR/webpage-lm/URLS > /dev/null 2>&1
 439 +       lat_http $remote 8008 < $SHAREDIR/webpage-lm/URLS
 440         lat_http -$remote 8008
 441         RM=
 442         for server in $SERVERS
 443 diff -urNd -urNd lmbench-2.0.4.old/scripts/lmbench~debian.patch lmbench-2.0.4/scripts/lmbench~debian.patch
 444 diff -urNd -urNd lmbench-2.0.4.old/scripts/results lmbench-2.0.4/scripts/results
 445 --- lmbench-2.0.4.old/scripts/results   2003-01-13 06:24:22.000000000 -0500
 446 +++ lmbench-2.0.4/scripts/results       2004-05-12 18:13:11.000000000 -0400
 447 @@ -2,20 +2,24 @@
 448
 449  # $Id$
 450
 451 -OS=`../scripts/os`
 452 -CONFIG=`../scripts/config`
 453 -RESULTS=results/$OS
 454 -BASE=../$RESULTS/`uname -n`
 455 +SHAREDIR=/usr/share/lmbench/
 456 +VARDIR=/var/lib/lmbench/
 457 +CONFIGDIR=$VARDIR/config/
 458 +BINDIR=/usr/lib/lmbench/
 459 +OS=`$SHAREDIR/scripts/os`
 460 +CONFIG=`$SHAREDIR/scripts/config`
 461 +RESULTS=$VARDIR/results/$OS
 462 +BASE=$RESULTS/`uname -n`
 463  EXT=0
 464
 465 -if [ ! -f "../bin/$OS/$CONFIG" ]
 466 +if [ ! -f "$CONFIGDIR/$CONFIG" ]
 467  then   echo "No config file?"
 468         exit 1
 469  fi
 470 -. ../bin/$OS/$CONFIG
 471 +. $CONFIGDIR/$CONFIG
 472
 473 -if [ ! -d ../$RESULTS ]
 474 -then   mkdir -p ../$RESULTS
 475 +if [ ! -d $RESULTS ]
 476 +then   mkdir -p $RESULTS
 477  fi
 478  RESULTS=$BASE.$EXT
 479  while [ -f $RESULTS ]
 480 @@ -23,16 +27,16 @@
 481         RESULTS=$BASE.$EXT
 482  done
 483
 484 -cd ../bin/$OS
 485 +cd $BINDIR
 486  export OUTPUT
 487  echo Results going to ${RESULTS}
 488 -../../scripts/lmbench $CONFIG 2>../${RESULTS}
 489 +$SHAREDIR/scripts/lmbench $CONFIGDIR/$CONFIG 2>${RESULTS}
 490
 491  if [ X$MAIL = Xyes ]
 492  then   (echo Mailing results
 493         echo ---- $INFO ---
 494         cat $INFO
 495         echo ---- $RESULTS ---
 496 -       cat ../$RESULTS) | mail lmbench2@bitmover.com
 497 +       cat $RESULTS) | mail lmbench2@bitmover.com
 498  fi
 499  exit 0
 500 diff -urNd -urNd lmbench-2.0.4.old/scripts/results~debian.patch lmbench-2.0.4/scripts/results~debian.patch
 501 diff -urNd -urNd lmbench-2.0.4.old/src/bk.ver lmbench-2.0.4/src/bk.ver
 502 diff -urNd -urNd lmbench-2.0.4.old/src/Makefile lmbench-2.0.4/src/Makefile