diff --git a/server/database/mariadb/actions.py b/server/database/mariadb/actions.py index c5ede517c6..4f6aded834 100644 --- a/server/database/mariadb/actions.py +++ b/server/database/mariadb/actions.py @@ -62,21 +62,21 @@ def install(): cmaketools.install("DESTDIR=%s benchdir_root=\"/usr/share/mysql\"" % get.installDIR()) # Config - pisitools.insinto("/etc/mysql", "%s/usr/share/mysql/my-medium.cnf" % get.installDIR(), "my.cnf") - pisitools.insinto("/etc/mysql", "%s/%s/scripts/mysqlaccess.conf" % (get.workDIR(), get.srcDIR())) + #pisitools.insinto("/etc/mysql", "%s/usr/share/mysql/my-medium.cnf" % get.installDIR(), "my.cnf") + #pisitools.insinto("/etc/mysql", "%s/%s/scripts/mysqlaccess.conf" % (get.workDIR(), get.srcDIR())) pisitools.insinto("/usr/bin", "%s/%s/scripts/mysql_config" % (get.workDIR(), get.srcDIR())) # Data dir pisitools.dodir("/var/lib/mysql") # Documents - pisitools.dodoc("%s/%s/support-files/my-*.cnf" % (get.workDIR(), get.srcDIR())) + #pisitools.dodoc("%s/%s/support-files/my-*.cnf" % (get.workDIR(), get.srcDIR())) pisitools.dodoc("COPYING", "INSTALL-SOURCE", "README*", "VERSION") # Remove not needed files pisitools.removeDir("/usr/data") pisitools.removeDir("/usr/mysql-test") pisitools.removeDir("/usr/sql-bench") - pisitools.remove("/usr/share/man/man1/mysql-test-run.pl.1") + #pisitools.remove("/usr/share/man/man1/mysql-test-run.pl.1") # Remove -lprobes_mysql #pisitools.dosed("%s/usr/bin/mysql_config" % get.installDIR(), "-lprobes_mysql") diff --git a/server/database/mariadb/pspec.xml b/server/database/mariadb/pspec.xml index 2842a71649..9f782cfa39 100644 --- a/server/database/mariadb/pspec.xml +++ b/server/database/mariadb/pspec.xml @@ -53,6 +53,7 @@ /usr/include /usr/lib/libmariadb.so.3 /usr/lib/libmariadbclient.a + /usr/lib/libmariadbd* /usr/lib/libmariadb.so /usr/lib/libmysqlclient.so /usr/lib/libmysqlclient.so.19 @@ -66,7 +67,8 @@ /usr/lib/libmysqld.so /usr/lib/libmysqld.so.19 /usr/lib/libmysqlservices.a - /usr/bin/mysqld_safe_helper + /usr/bin/mysqld_safe_helper + /usr/lib/pkgconfig/libmariadb.pc