diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-25 19:45:53 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-27 21:38:15 +0300 |
commit | 316dfdd917bec6a218f431211d28bf8df6b6fb0f (patch) | |
tree | 5541073f9851f44c2bd67b4959dc776ee3c3810f /import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch | |
parent | 36acd3e888044dea2ac0b2946f15616f968388c9 (diff) | |
download | openbmc-316dfdd917bec6a218f431211d28bf8df6b6fb0f.tar.xz |
Yocto 2.5
Move OpenBMC to Yocto 2.5(sumo)
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Change-Id: I5c5ad6904a16e14c1c397f0baf10c9d465594a78
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch')
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch | 84 |
1 files changed, 47 insertions, 37 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch index 894f146d4..31c4aecbb 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch @@ -1,45 +1,24 @@ +From 4955021bc283be404df62b97b86af3943efd29de Mon Sep 17 00:00:00 2001 +From: Noor Ahsan <noor_ahsan@mentor.com> +Date: Mon, 29 Aug 2011 16:17:51 +0000 +Subject: [PATCH] lmbench: Add version 3.0-a9 (initial recipe) + Now that we have our binaries in /usr/bin rather than the normal lmbench hierarchy we need to update the scripts as well to behave well here. Upstream-Status: Inappropriate [This is related to the OE-specific behavior -of installing into /usr/bin, etc, rather than dumping everything into +of installing into /usr/bin, etc, rather than dumping everything into /usr/share/lmbench or similar] -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 +--- + scripts/config-run | 40 ++++++++++++++++++++-------------------- + scripts/results | 8 +++----- + 2 files changed, 23 insertions(+), 25 deletions(-) + +diff --git a/scripts/config-run b/scripts/config-run +index a2d5ba4..918cbdf 100755 +--- a/scripts/config-run ++++ b/scripts/config-run @@ -132,20 +132,20 @@ export LMBENCH_SCHED ############################################################################ echo $L; echo ""; @@ -89,7 +68,7 @@ Index: lmbench-3.0-a9/scripts/config-run 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 +@@ -223,8 +223,8 @@ then echo Warning: you have only ${MB}MB available memory. fi echo "Hang on, we are calculating your cache line size." @@ -158,3 +137,34 @@ Index: lmbench-3.0-a9/scripts/config-run echo DISKS=\"$DISKS\" > $C echo DISK_DESC=\"$DISK_DESC\" >> $C echo OUTPUT=$OUTPUT >> $C +diff --git a/scripts/results b/scripts/results +index cd07c15..d5aa558 100755 +--- a/scripts/results ++++ b/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 |