diff options
author | Kang Kai <kai.kang@windriver.com> | 2014-11-18 17:54:37 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-11-24 12:01:53 +0100 |
commit | 66e9c19579def6551fd750f82a9695b06b5eb596 (patch) | |
tree | b7acf114f1d070edb8d3ed1251daa2c472a30752 /meta-oe | |
parent | 6db864c93193c6e353ef37160e8ff1bcfb8f5337 (diff) | |
download | meta-openembedded-contrib-66e9c19579def6551fd750f82a9695b06b5eb596.tar.gz |
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>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb.inc | 11 | ||||
-rw-r--r-- | meta-oe/recipes-support/mysql/mariadb/my.cnf | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb.inc b/meta-oe/recipes-support/mysql/mariadb.inc index 3d0f5939d1..a04288d6f1 100644 --- a/meta-oe/recipes-support/mysql/mariadb.inc +++ b/meta-oe/recipes-support/mysql/mariadb.inc @@ -135,7 +135,9 @@ PACKAGES = "${PN}-dbg ${PN} \ libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \ libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \ 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} = " " 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" FILES_libmysqlclient = "\ - ${libdir}/libmysqlclient.so.*" + ${libdir}/libmysqlclient.so.* \ + ${sysconfdir}/my.cnf.d/client.cnf" FILES_libmysqlclient-dev = " \ ${includedir}/mysql/ \ ${libdir}/libmysqlclient.so \ @@ -200,7 +203,8 @@ FILES_${PN}-client = "\ ${bindir}/mysqlshow \ ${bindir}/mysqlslap \ ${bindir}/mysqltest_embedded \ - ${libexecdir}/mysqlmanager" + ${libexecdir}/mysqlmanager \ + ${sysconfdir}/my.cnf.d/mysql-clients.cnf" FILES_${PN}-server = "\ ${bindir}/comp_err \ @@ -250,6 +254,7 @@ FILES_${PN}-server = "\ ${localstatedir}/mysql/ \ ${sysconfdir}/init.d \ ${sysconfdir}/my.cnf \ + ${sysconfdir}/my.cnf.d/server.cnf \ ${sysconfdir}/tmpfiles.d" DESCRIPTION_${PN}-leftovers = "unpackaged and probably unneeded files for ${PN}" diff --git a/meta-oe/recipes-support/mysql/mariadb/my.cnf b/meta-oe/recipes-support/mysql/mariadb/my.cnf index c9b785b6bc..876ce366a6 100644 --- a/meta-oe/recipes-support/mysql/mariadb/my.cnf +++ b/meta-oe/recipes-support/mysql/mariadb/my.cnf @@ -20,3 +20,7 @@ ignore-builtin-innodb default-storage-engine = myisam bind-address = localhost +# +# include all files from the config directory +# +!includedir /etc/my.cnf.d |