diff options
| author |   Li xin <lixin.fnst@cn.fujitsu.com> | 2016-04-26 12:53:14 +0300 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-28 10:38:56 +0200 |
| commit | b5a7dfbea5de5315eb09235e6dcd4930fcc467da (patch) | |
| tree | e31c26b525046498cfed90c8c54022fbb52ea02d | |
| parent | d1be64c692c49a65581c5510e0826ad70d2eb29d (diff) | |
| download | meta-openembedded-b5a7dfbea5de5315eb09235e6dcd4930fcc467da.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>
| -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} \ |