aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi xin <lixin.fnst@cn.fujitsu.com>2016-04-26 12:53:14 +0300
committerArmin Kuster <akuster808@gmail.com>2016-04-28 12:33:48 -0700
commit7c89ca632d299e8b46e39452e43c66e098846642 (patch)
tree8c2b2e1a3b882c743cfc4711abb892fdcfb4a7b2
parentd3c541cbcc2f4d4bcbbf7fc975112798a783a32a (diff)
downloadmeta-openembedded-7c89ca632d299e8b46e39452e43c66e098846642.tar.gz
meta-openembedded-7c89ca632d299e8b46e39452e43c66e098846642.tar.bz2
meta-openembedded-7c89ca632d299e8b46e39452e43c66e098846642.zip
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@cn.fujitsu.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/mysql/mariadb.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc
index a6826c31e..668200b2a 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} \