mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

lmbench: update script lmbench-run

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run
-1
View File
@@ -4,7 +4,6 @@
# Javier Fernandez-Sanguino. # Javier Fernandez-Sanguino.
# Distributed under the GPL # Distributed under the GPL
SHAREDIR=/usr/share/lmbench/ SHAREDIR=/usr/share/lmbench/
BINDIR=/usr/lib/lmbench/
SCRIPTSDIR=$SHAREDIR/scripts SCRIPTSDIR=$SHAREDIR/scripts
RESULTSDIR=$SHAREDIR/results RESULTSDIR=$SHAREDIR/results
CONFIG=/var/lib/lmbench/config/`$SCRIPTSDIR/config` CONFIG=/var/lib/lmbench/config/`$SCRIPTSDIR/config`
meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
+2 -3
View File
@@ -54,7 +54,7 @@ do_compile () {
do_install () { do_install () {
install -d ${D}${sysconfdir}/default/volatiles \ install -d ${D}${sysconfdir}/default/volatiles \
${D}${bindir} ${D}${mandir} ${D}${libdir}/lmbench \ ${D}${bindir} ${D}${mandir} \
${D}${datadir}/lmbench/scripts ${D}${datadir}/lmbench/scripts
echo "d root root 0755 ${localstatedir}/run/${BPN} none" \ echo "d root root 0755 ${localstatedir}/run/${BPN} none" \
@@ -71,7 +71,6 @@ do_install () {
mv ${D}${bindir}/line ${D}${bindir}/lm_line mv ${D}${bindir}/line ${D}${bindir}/lm_line
install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/ install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/
sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${BPN},;' \ sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${BPN},;' \
-e 's,^BINDIR=.*$,BINDIR=${libdir}/${BPN},;' \
-e 's,^CONFIG=.*$,CONFIG=`$SCRIPTSDIR/config`,;' \ -e 's,^CONFIG=.*$,CONFIG=`$SCRIPTSDIR/config`,;' \
${D}${bindir}/lmbench-run ${D}${bindir}/lmbench-run
install -m 0755 ${S}/scripts/lmbench ${D}${bindir} install -m 0755 ${S}/scripts/lmbench ${D}${bindir}
@@ -89,4 +88,4 @@ pkg_postinst_${PN} () {
} }
RDEPENDS_${PN} = "perl" RDEPENDS_${PN} = "perl"
FILES_${PN} += "${datadir}/lmbench ${libdir}/lmbench" FILES_${PN} += "${datadir}/lmbench"