diff options
| author |   Li xin <lixin.fnst@cn.fujitsu.com> | 2016-04-26 12:53:14 +0300 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2016-05-02 14:03:04 -0700 |
| commit | ebb31a9b4ee8827bf6a5ba066fccaf7a35db645b (patch) | |
| tree | 92fad48ef29c23d55f9c09b7032adcc69ba9c2da /meta-oe | |
| parent | 852b40fe8d9f470b52116a21972139038ca405eb (diff) | |
| download | meta-openembedded-ebb31a9b4ee8827bf6a5ba066fccaf7a35db645b.tar.gz | |
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>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-support/mysql/mariadb.inc | 5 |
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 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} \ |