[oe-commits] Christopher Larson : lmbench: fix the CONFIG path in lmbench-run

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 99f52e58d13cb0a1cda03a6f75d8b3fb527f6dd2
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=99f52e58d13cb0a1cda03a6f75d8b3fb527f6dd2

Author: Christopher Larson <kergoth at gmail.com>
Date:   Wed Nov 27 10:50:20 2013 -0700

lmbench: fix the CONFIG path in lmbench-run

The 'config' script which gets run returns '../scripts/CONFIG.<machine>', so
the current value was '${datadir}/lmbench/../scripts/CONFIG.<machine>', which
is obviously not ideal. Remove the $SHAREDIR prefix, as the relative path will
work from the scripts dir where lmbench-run runs. With this, we can install
a custom CONFIG.qemux86 into ${datadir}/lmbench/scripts/, for example.

Signed-off-by: Christopher Larson <kergoth at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
index fb8cf4f..b4020d7 100644
--- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
+++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
@@ -55,7 +55,7 @@ do_install () {
     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`,;' \
+           -e 's,^CONFIG=.*$,CONFIG=`$SCRIPTSDIR/config`,;' \
            ${D}${bindir}/lmbench-run
     install -m 0755 ${S}/scripts/lmbench ${D}${bindir}
     install -m 0755 ${S}/scripts/* ${D}${datadir}/lmbench/scripts