mariadb: fix file conflictions when multilib enabled
PATCH 1/2 mariadb: fix file conflictions when multilib enabled
From: Kai Kang <[email protected]>
When multilib is enabled, it complains file conflictions of /usr/bin/mysql_install_db and /usr/bin/mysqld_safe.
Inherit multilib_script to solve the issues.
Signed-off-by Kai Kang <[email protected]>
--- meta-oe/recipes-dbs/mysql/mariadb.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta-oe/recipes-dbs/mysql/mariadb.inc +3 -1
@@ -28,7 +28,9 @@ S = "${WORKDIR}/mariadb-${PV}" BINCONFIG_GLOB = "mysql_config" -inherit cmake gettext binconfig update-rc.d useradd systemd +inherit cmake gettext binconfig update-rc.d useradd systemd multilib_script + +MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mysql_install_db ${PN}-server:${bindir}/mysqld_safe" INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" INITSCRIPT_NAME_${PN}-server = "mysqld"
Signature · 1 line
2.20.0
PATCH 2/2 lmbench: update script lmbench-run
From: Kai Kang <[email protected]>
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 <[email protected]>
--- 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(-)
meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run +0 -1
@@ -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`
meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +2 -3
@@ -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"
Signature · 1 line
2.20.0