From 1706197678cdb7de787e0dbd4b6c0f3ece15ffaa Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Wed, 4 Sep 2019 04:42:29 -0400 Subject: 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 Signed-off-by: Khem Raj --- meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run | 1 - meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run b/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run index e904c75e43..2716bf935b 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run +++ b/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run @@ -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` 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 8e6e803a8d..7e20b7da65 100644 --- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -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" -- cgit 1.2.3-korg