Skip to contentSkip to conversation

mariadb: fix warning and update libdir for libtool

PATCH In review Hongxu Jia 2 participants 4 messages Oct 9, 2013

lore
Share & tools
lore

Hongxu Jia

author
#0 lore raw

cover mariadb: fix warning and update libdir for libtool

The following changes since commit 2a463dddcf76d7fa437e96f6cf0210143e97a904:

thunar-volman: Add PACKAGECONFIG for notify (2013-10-05 14:24:05 +0200)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/fix-mariadb
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-mariadb

Hongxu Jia (2):
mariadb: update libdir for libtool
mariadb: fix warning while invoking 'mysql_install_db' on target

 meta-oe/recipes-support/mysql/mariadb/my.cnf     | 2 +-
 meta-oe/recipes-support/mysql/mariadb_5.1.67.inc | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 1/2 mariadb: update libdir for libtool

In mariadb recipe,do_install move all the lib files from usr/lib/mysql to usr/lib,but didn't change libdir value in *.la libtool file. This will cause libtool can't get correct lib path of mysql when other package need mysql lib.So update them to correct value.

Here is a exapmle:
In libmysqlclient.la file: libdir = "/usr/lib/mysq/", but in fact libmysqclient.so is installed into "/usr/lib", this will cause libtool can not find correct lib file with libmysqlclient.la, then libtool will use rpath option to reference a absolute path, and this will cause rpath WARING and rpm error.

---
 meta-oe/recipes-support/mysql/mariadb_5.1.67.inc | 1 +
 1 file changed, 1 insertion(+)
meta-oe/recipes-support/mysql/mariadb_5.1.67.inc +1 -0
index c535a41..fd9264f 100644
@@ -80,6 +80,7 @@ do_install() {
     oe_runmake 'DESTDIR=${D}' install
     mv -f ${D}${libdir}/mysql/* ${D}${libdir}
     rmdir ${D}${libdir}/mysql
+    find ${D}${libdir} -name '*.la'|xargs sed -i 's#${libdir}/mysql#${libdir}#'
 
     install -d ${D}/etc/init.d
     install -m 0644 ${WORKDIR}/my.cnf ${D}/etc/
Signature · 1 line
1.8.1.2
author
#2 lore raw

PATCH 2/2 mariadb: fix warning while invoking 'mysql_install_db' on target

In reply to Hongxu Jia

Invoke 'mysql_install_db' on target, there are some warnings:
...
Installing MariaDB/MySQL system tables...
131009 6:13:14 [Warning] '--skip-locking' is deprecated and will be removed in a future release. Please use '--skip-external-locking' instead. OK
Filling help tables...
131009 6:13:14 [Warning] '--skip-locking' is deprecated and will be removed in a future release. Please use '--skip-external-locking' instead. OK
...

Modify my.cnf to use '--skip-external-locking' instead of '--skip-locking' could fix this issue.

---
 meta-oe/recipes-support/mysql/mariadb/my.cnf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/mysql/mariadb/my.cnf +1 -1
index 8470817..d174381 100644
@@ -14,7 +14,7 @@ pid-file 					= /var/lib/mysql/mysqld.pid
 log-error 					= /var/log/mysqld.err
 basedir 					= /usr
 datadir 					= /var/mysql
-skip-locking
+skip-external-locking
 skip-networking
 ignore-builtin-innodb
 bind-address					= localhost
Signature · 1 line
1.8.1.2
Acked-by on the v1 series
#3 lore raw
In reply to Hongxu Jia

Hi Hongxu,

Quoted 9 lines · On Wednesday 09 October 2013 15:30:33 Hongxu Jia wrote:

The following changes since commit 2a463dddcf76d7fa437e96f6cf0210143e97a904:

thunar-volman: Add PACKAGECONFIG for notify (2013-10-05 14:24:05 +0200)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib hongxu/fix-mariadb
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-mariadb

Quoted 7 lines

Hongxu Jia (2):
mariadb: update libdir for libtool
mariadb: fix warning while invoking 'mysql_install_db' on target

 meta-oe/recipes-support/mysql/mariadb/my.cnf     | 2 +-
 meta-oe/recipes-support/mysql/mariadb_5.1.67.inc | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

These look OK to me.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre