Patchwork [meta-oe,2/2] lmbench: fix the CONFIG path in lmbench-run

login
register
mail settings
Submitter Christopher Larson
Date Nov. 27, 2013, 5:50 p.m.
Message ID <1385574620-9408-2-git-send-email-kergoth@gmail.com>
Download mbox | patch
Permalink /patch/62497/
State Accepted, archived
Headers show

Comments

Christopher Larson - Nov. 27, 2013, 5:50 p.m.
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@gmail.com>
---
 meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

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