From b5a7dfbea5de5315eb09235e6dcd4930fcc467da Mon Sep 17 00:00:00 2001 From: Li xin Date: Tue, 26 Apr 2016 12:53:14 +0300 Subject: mariadb: Fix rootfs creation errors error: file /usr/share/doc/README from install of mariadb-leftovers-5.5.46-* conflicts with file from package dmidecode-doc-2.12-* Signed-off-by: Li Xin Signed-off-by: Martin Jansa --- meta-oe/recipes-support/mysql/mariadb.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index 6a554763a3..4801ffe227 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc @@ -145,7 +145,10 @@ do_install() { fi install -d ${D}${bindir} install -m 755 ${WORKDIR}/mysql-systemd-start ${D}${bindir} - + install -d ${D}${datadir}/doc/${PN} + if [ -f ${D}${datadir}/doc/README ]; then + mv ${D}${datadir}/doc/README ${D}${datadir}/doc/${PN}/ + fi } PACKAGES = "${PN}-dbg ${PN} \ -- cgit 1.2.3-korg