diff options
-rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb.inc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 8ac0dbb51..b9fa98b5a 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc | |||
@@ -162,13 +162,15 @@ do_install() { | |||
162 | } | 162 | } |
163 | 163 | ||
164 | PACKAGES = "${PN}-dbg ${PN} \ | 164 | PACKAGES = "${PN}-dbg ${PN} \ |
165 | libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \ | 165 | libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev \ |
166 | libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \ | 166 | libmysqlclient libmysqlclient-dev libmysqlclient-staticdev \ |
167 | libmysqld libmysqld-dev ${PN}-client ${PN}-server ${PN}-setupdb ${PN}-leftovers" | 167 | libmysqld libmysqld-dev ${PN}-client ${PN}-server ${PN}-setupdb ${PN}-leftovers" |
168 | CONFFILES_${PN}-server += "${sysconfdir}/my.cnf ${sysconfdir}/my.cnf.d/server.cnf" | 168 | CONFFILES_${PN}-server += "${sysconfdir}/my.cnf ${sysconfdir}/my.cnf.d/server.cnf" |
169 | CONFFILES_${PN}-client += "${sysconfdir}/my.cnf.d/mysql-clients.cnf" | 169 | CONFFILES_${PN}-client += "${sysconfdir}/my.cnf.d/mysql-clients.cnf" |
170 | CONFFILES_libmysqlclient += "${sysconfdir}/my.cnf.d/client.cnf" | 170 | CONFFILES_libmysqlclient += "${sysconfdir}/my.cnf.d/client.cnf" |
171 | 171 | ||
172 | RPROVIDES_${PN}-dbg += "libmysqlclient-r-dbg libmysqlclient-dbg" | ||
173 | |||
172 | FILES_${PN} = " " | 174 | FILES_${PN} = " " |
173 | RDEPENDS_${PN} = "${PN}-client ${PN}-server" | 175 | RDEPENDS_${PN} = "${PN}-client ${PN}-server" |
174 | ALLOW_EMPTY_${PN} = "1" | 176 | ALLOW_EMPTY_${PN} = "1" |
@@ -201,8 +203,6 @@ FILES_libmysqlclient-dev = " \ | |||
201 | ${bindir}/mysql_config" | 203 | ${bindir}/mysql_config" |
202 | FILES_libmysqlclient-staticdev = "\ | 204 | FILES_libmysqlclient-staticdev = "\ |
203 | ${libdir}/*.a" | 205 | ${libdir}/*.a" |
204 | FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \ | ||
205 | ${datadir}/mysql-test/lib/My/SafeProcess/.debug/my_safe_process" | ||
206 | 206 | ||
207 | # Avoid warnings about ha_xtradb.so.0.0.0 and ha_innodb_plugin.so.0.0.0 | 207 | # Avoid warnings about ha_xtradb.so.0.0.0 and ha_innodb_plugin.so.0.0.0 |
208 | # which are intentionally non-PIC on 32-bit x86 (see e.g. | 208 | # which are intentionally non-PIC on 32-bit x86 (see e.g. |
@@ -213,7 +213,6 @@ FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*" | |||
213 | FILES_libmysqlclient-r-dev = "\ | 213 | FILES_libmysqlclient-r-dev = "\ |
214 | ${libdir}/libmysqlclient_r.so" | 214 | ${libdir}/libmysqlclient_r.so" |
215 | FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a" | 215 | FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a" |
216 | FILES_libmysqlclient-r-dbg = "${libdir}/plugin/.debuglibmysqlclient_r.so.*" | ||
217 | 216 | ||
218 | FILES_libmysqld = "\ | 217 | FILES_libmysqld = "\ |
219 | ${libdir}/libmysqld.so.*" | 218 | ${libdir}/libmysqld.so.*" |