[oe-commits] [meta-openembedded] 34/36: mariadb: Fix rootfs creation errors

[git at git.openembedded.org]

martin_jansa pushed a commit to branch jethro-next
in repository meta-openembedded.

commit 7c89ca632d299e8b46e39452e43c66e098846642
Author: Li xin <lixin.fnst at cn.fujitsu.com>
AuthorDate: Tue Apr 26 12:53:14 2016 +0300

    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 <lixin.fnst at cn.fujitsu.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 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 a6826c3..668200b 100644
--- a/meta-oe/recipes-support/mysql/mariadb.inc
+++ b/meta-oe/recipes-support/mysql/mariadb.inc
@@ -142,7 +142,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} \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.