mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-31 13:20:03 +00:00
Code Issues Projects Releases Wiki Activity

mariadb: split one dpg package

Browse Source 
Multiple -dbg packages per recipe is not encouraged, and only one is
recommended and the code only works properly in some cases for one.

Add RPROVIDES_${PN}-dbg to be compatiable with previous dbg packages
requiring.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Hongxu Jia
2018-09-18 00:05:26 +08:00
committed by Khem Raj
parent d9abf69f20
commit 3f6b81b85c
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-dbs/mysql/mariadb.inc
+4 -5
View File
@@ -162,13 +162,15 @@ do_install() {
} }
PACKAGES = "${PN}-dbg ${PN} \ PACKAGES = "${PN}-dbg ${PN} \
libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \ libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev \
libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \ libmysqlclient libmysqlclient-dev libmysqlclient-staticdev \
libmysqld libmysqld-dev ${PN}-client ${PN}-server ${PN}-setupdb ${PN}-leftovers" libmysqld libmysqld-dev ${PN}-client ${PN}-server ${PN}-setupdb ${PN}-leftovers"
CONFFILES_${PN}-server += "${sysconfdir}/my.cnf ${sysconfdir}/my.cnf.d/server.cnf" CONFFILES_${PN}-server += "${sysconfdir}/my.cnf ${sysconfdir}/my.cnf.d/server.cnf"
CONFFILES_${PN}-client += "${sysconfdir}/my.cnf.d/mysql-clients.cnf" CONFFILES_${PN}-client += "${sysconfdir}/my.cnf.d/mysql-clients.cnf"
CONFFILES_libmysqlclient += "${sysconfdir}/my.cnf.d/client.cnf" CONFFILES_libmysqlclient += "${sysconfdir}/my.cnf.d/client.cnf"
RPROVIDES_${PN}-dbg += "libmysqlclient-r-dbg libmysqlclient-dbg"
FILES_${PN} = " " FILES_${PN} = " "
RDEPENDS_${PN} = "${PN}-client ${PN}-server" RDEPENDS_${PN} = "${PN}-client ${PN}-server"
ALLOW_EMPTY_${PN} = "1" ALLOW_EMPTY_${PN} = "1"
@@ -201,8 +203,6 @@ FILES_libmysqlclient-dev = " \
${bindir}/mysql_config" ${bindir}/mysql_config"
FILES_libmysqlclient-staticdev = "\ FILES_libmysqlclient-staticdev = "\
${libdir}/*.a" ${libdir}/*.a"
FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \
${datadir}/mysql-test/lib/My/SafeProcess/.debug/my_safe_process"
# Avoid warnings about ha_xtradb.so.0.0.0 and ha_innodb_plugin.so.0.0.0 # Avoid warnings about ha_xtradb.so.0.0.0 and ha_innodb_plugin.so.0.0.0
# which are intentionally non-PIC on 32-bit x86 (see e.g. # which are intentionally non-PIC on 32-bit x86 (see e.g.
@@ -213,7 +213,6 @@ FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*"
FILES_libmysqlclient-r-dev = "\ FILES_libmysqlclient-r-dev = "\
${libdir}/libmysqlclient_r.so" ${libdir}/libmysqlclient_r.so"
FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a" FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a"
FILES_libmysqlclient-r-dbg = "${libdir}/plugin/.debuglibmysqlclient_r.so.*"
FILES_libmysqld = "\ FILES_libmysqld = "\
${libdir}/libmysqld.so.*" ${libdir}/libmysqld.so.*"