lmbench: update script lmbench-run

Remove BINDIR in script lmbench-run which is useless and causes multilib
file confliction:

| Error: Transaction check error:
|   file /usr/bin/lmbench-run conflicts between attempted installs of
    lmbench-3.0+a9-r2.core2_64 and lib32-lmbench-3.0+a9-r2.core2_32

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Kai Kang 2019-09-04 04:42:29 -04:00 committed by Khem Raj
parent e3485d0cf5
commit 1706197678
2 changed files with 2 additions and 4 deletions

View File

@ -4,7 +4,6 @@
# Javier Fernandez-Sanguino.
# Distributed under the GPL
SHAREDIR=/usr/share/lmbench/
BINDIR=/usr/lib/lmbench/
SCRIPTSDIR=$SHAREDIR/scripts
RESULTSDIR=$SHAREDIR/results
CONFIG=/var/lib/lmbench/config/`$SCRIPTSDIR/config`

View File

@ -54,7 +54,7 @@ do_compile () {
do_install () {
install -d ${D}${sysconfdir}/default/volatiles \
${D}${bindir} ${D}${mandir} ${D}${libdir}/lmbench \
${D}${bindir} ${D}${mandir} \
${D}${datadir}/lmbench/scripts
echo "d root root 0755 ${localstatedir}/run/${BPN} none" \
@ -71,7 +71,6 @@ do_install () {
mv ${D}${bindir}/line ${D}${bindir}/lm_line
install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/
sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${BPN},;' \
-e 's,^BINDIR=.*$,BINDIR=${libdir}/${BPN},;' \
-e 's,^CONFIG=.*$,CONFIG=`$SCRIPTSDIR/config`,;' \
${D}${bindir}/lmbench-run
install -m 0755 ${S}/scripts/lmbench ${D}${bindir}
@ -89,4 +88,4 @@ pkg_postinst_${PN} () {
}
RDEPENDS_${PN} = "perl"
FILES_${PN} += "${datadir}/lmbench ${libdir}/lmbench"
FILES_${PN} += "${datadir}/lmbench"