mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-03 14:19:52 +00:00
mariadb: re-package configure files
There are 3 configure files under /etc/my.cnf.d: client.cnf: options for client library mysql-clients.cnf: options for MariaDB tools such as mysqladmin, etc server.cnf: options for server They are packaged to mariadb-leftover at this moment. That is not correct. Split them into sub-packages: client.cnf --> libmysqlclient mysql-clients.cnf --> mariadb-client server.cnf --> mariadb-server Make these files as configure file by CONFFILES and update global configure file my.cnf to include /etc/my.cnf.d as well. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
@@ -135,7 +135,9 @@ PACKAGES = "${PN}-dbg ${PN} \
|
|||||||
libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \
|
libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \
|
||||||
libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \
|
libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \
|
||||||
libmysqld libmysqld-dev ${PN}-client ${PN}-server ${PN}-leftovers"
|
libmysqld libmysqld-dev ${PN}-client ${PN}-server ${PN}-leftovers"
|
||||||
CONFFILES_${PN}-server += "${sysconfdir}/my.cnf"
|
CONFFILES_${PN}-server += "${sysconfdir}/my.cnf ${sysconfdir}/my.cnf.d/server.cnf"
|
||||||
|
CONFFILES_${PN}-client += "${sysconfdir}/my.cnf.d/mysql-clients.cnf"
|
||||||
|
CONFFILES_libmysqlclient += "${sysconfdir}/my.cnf.d/client.cnf"
|
||||||
|
|
||||||
FILES_${PN} = " "
|
FILES_${PN} = " "
|
||||||
RDEPENDS_${PN} = "${PN}-client ${PN}-server"
|
RDEPENDS_${PN} = "${PN}-client ${PN}-server"
|
||||||
@@ -155,7 +157,8 @@ RDEPENDS_${PN}-leftovers = "perl perl-module-cwd perl-module-benchmark perl-modu
|
|||||||
perl-module-io-socket-inet perl-module-io-select"
|
perl-module-io-socket-inet perl-module-io-select"
|
||||||
|
|
||||||
FILES_libmysqlclient = "\
|
FILES_libmysqlclient = "\
|
||||||
${libdir}/libmysqlclient.so.*"
|
${libdir}/libmysqlclient.so.* \
|
||||||
|
${sysconfdir}/my.cnf.d/client.cnf"
|
||||||
FILES_libmysqlclient-dev = " \
|
FILES_libmysqlclient-dev = " \
|
||||||
${includedir}/mysql/ \
|
${includedir}/mysql/ \
|
||||||
${libdir}/libmysqlclient.so \
|
${libdir}/libmysqlclient.so \
|
||||||
@@ -200,7 +203,8 @@ FILES_${PN}-client = "\
|
|||||||
${bindir}/mysqlshow \
|
${bindir}/mysqlshow \
|
||||||
${bindir}/mysqlslap \
|
${bindir}/mysqlslap \
|
||||||
${bindir}/mysqltest_embedded \
|
${bindir}/mysqltest_embedded \
|
||||||
${libexecdir}/mysqlmanager"
|
${libexecdir}/mysqlmanager \
|
||||||
|
${sysconfdir}/my.cnf.d/mysql-clients.cnf"
|
||||||
|
|
||||||
FILES_${PN}-server = "\
|
FILES_${PN}-server = "\
|
||||||
${bindir}/comp_err \
|
${bindir}/comp_err \
|
||||||
@@ -250,6 +254,7 @@ FILES_${PN}-server = "\
|
|||||||
${localstatedir}/mysql/ \
|
${localstatedir}/mysql/ \
|
||||||
${sysconfdir}/init.d \
|
${sysconfdir}/init.d \
|
||||||
${sysconfdir}/my.cnf \
|
${sysconfdir}/my.cnf \
|
||||||
|
${sysconfdir}/my.cnf.d/server.cnf \
|
||||||
${sysconfdir}/tmpfiles.d"
|
${sysconfdir}/tmpfiles.d"
|
||||||
|
|
||||||
DESCRIPTION_${PN}-leftovers = "unpackaged and probably unneeded files for ${PN}"
|
DESCRIPTION_${PN}-leftovers = "unpackaged and probably unneeded files for ${PN}"
|
||||||
|
|||||||
@@ -20,3 +20,7 @@ ignore-builtin-innodb
|
|||||||
default-storage-engine = myisam
|
default-storage-engine = myisam
|
||||||
bind-address = localhost
|
bind-address = localhost
|
||||||
|
|
||||||
|
#
|
||||||
|
# include all files from the config directory
|
||||||
|
#
|
||||||
|
!includedir /etc/my.cnf.d
|
||||||
|
|||||||
Reference in New Issue
Block a user