Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7513 from IdrisKalp/master

Browse Source 
mariadb fix
This commit is contained in:
Idris Kalp
2020-01-12 23:01:10 +03:00
committed by GitHub
parent 732f8d8056 24e0e325bc
commit 0eafeee680
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/database/mariadb/actions.py
+4 -4
View File
@@ -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")
server/database/mariadb/pspec.xml
+3 -1
View File
@@ -53,6 +53,7 @@
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib/libmariadb.so.3</Path>
<Path fileType="library">/usr/lib/libmariadbclient.a</Path>
<Path fileType="library">/usr/lib/libmariadbd*</Path>
<Path fileType="library">/usr/lib/libmariadb.so</Path>
<Path fileType="library">/usr/lib/libmysqlclient.so</Path>
<Path fileType="library">/usr/lib/libmysqlclient.so.19</Path>
@@ -66,7 +67,8 @@
<Path fileType="library">/usr/lib/libmysqld.so</Path>
<Path fileType="library">/usr/lib/libmysqld.so.19</Path>
<Path fileType="library">/usr/lib/libmysqlservices.a</Path>
<Path fileType="library">/usr/bin/mysqld_safe_helper</Path>
<Path fileType="executable">/usr/bin/mysqld_safe_helper</Path>
<Path fileType="data">/usr/lib/pkgconfig/libmariadb.pc</Path>
</Files>
</Package>