Update MySQL client package

PATCH New Marcelo Gutierrez 3 participants 4 messages Jan 18, 2014 – Feb 1, 2014

Share & tools

Marcelo Gutierrez

author

2014-01-18 21:24 UTC #0 lore raw

PATCH 2/2 Update MySQL client package

Changes v1 -> v2:
- fix comments following new policy
- rename patches
- remove useless hook points
- add the URL to the home of MySQL
- add commit-log description to the patches
- install host tools to $(HOST_DIR)/usr/bin
- fix only builds the required program

Signed-off-by Marcelo Guti?rrez(UTN/FRH) <[email protected]>

---
 package/mysql_client/Config.in                     |   20 +++++++--
 package/mysql_client/S60mysqld                     |   25 +++++++++++
 .../mysql_client-Fix-gen_lex_hash-execution.patch  |   28 ++++++++++++
 .../mysql_client-ac_stack_direction-is-unset.patch |   15 +++++++
 package/mysql_client/mysql_client.mk               |   47 +++++++++++++++++++-
 5 files changed, 130 insertions(+), 5 deletions(-)
 create mode 100644 package/mysql_client/S60mysqld
 create mode 100644
package/mysql_client/mysql_client-Fix-gen_lex_hash-execution.patch
 create mode 100644

package/mysql_client/mysql_client-ac_stack_direction-is-unset.patch

package/mysql_client/Config.in +16 -4

index 543bed1..8ebe70f 100644
@@ -1,13 +1,25 @@
-config BR2_PACKAGE_MYSQL_CLIENT
-       bool "MySQL client"
+config BR2_PACKAGE_MYSQL
+       bool "MySQL"
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_USE_MMU # fork()
        depends on BR2_TOOLCHAIN_HAS_THREADS
        select BR2_PACKAGE_NCURSES
        select BR2_PACKAGE_READLINE
        help
-         MySQL client
+         The MySQL Open Source Database System
+         http://www.mysql.com/
 
-comment "MySQL client needs a toolchain w/ C++, threads"
+comment "MySQL server and MySQL client needs a toolchain w/ C++, threads"
        depends on BR2_USE_MMU
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+
+if BR2_PACKAGE_MYSQL
+
+config BR2_PACKAGE_MYSQL_CLIENT
+        bool "MySQL client"
+
+config BR2_PACKAGE_MYSQL_CLIENT_SERVER
+       bool "MySQL server"
+
+endif
+

package/mysql_client/S60mysqld new file +25 -0

new file mode 100644
index 0000000..38e1c41
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# Starts mysqld.
+#
+
+case "$1" in
+       start)
+               /usr/bin/mysqld_safe &
+               ;;
+       stop)
+               if test -f /var/lib/mysql/mysqld.pid ; then
+                       PID=`cat /var/lib/mysql/mysqld.pid`
+                       kill $PID
+               fi
+               ;;
+       restart)
+               $0 stop
+               $0 start
+               ;;
+       *)
+               echo "Usage: /etc/init.d/mysqld {start|stop|restart}"
+               ;;
+esac
+
+exit 0

(quoted diff) +0 -0

b/package/mysql_client/mysql_client-Fix-gen_lex_hash-execution.patch new file mode 100644
index 0000000..377cabb

package/mysql_client/mysql_client-Fix-gen_lex_hash-execution.patch new file +28 -0

@@ -0,0 +1,28 @@
+When MySQL server is enabled, I first compile the tool with the host gcc
+and then copy into the "$(HOST_DIR)/usr/bin/" folder
+
+Signed-off-by: Marcelo Gutierrez (UTN/FRH) <[email protected]>
+
+--- mysql-5.1.70/sql/Makefile.am
++++ mysql-5.1.70.patch/sql/Makefile.am
+@@ -177,7 +177,7 @@
+ # this avoid the rebuild of the built files in a source dist
+ lex_hash.h:   gen_lex_hash.cc lex.h
+               $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+-              ./gen_lex_hash$(EXEEXT) > $@-t
++              gen_lex_hash$(EXEEXT) > $@-t
+               $(MV) $@-t $@
+
+ # For testing of udf_example.so
+
+--- mysql-5.1.70/sql/Makefile.in
++++ mysql-5.1.70.patch/sql/Makefile.in
+@@ -1310,7 +1310,7 @@
+ # this avoid the rebuild of the built files in a source dist
+ lex_hash.h:   gen_lex_hash.cc lex.h
+               $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+-              ./gen_lex_hash$(EXEEXT) > $@-t
++              gen_lex_hash$(EXEEXT) > $@-t
+               $(MV) $@-t $@
+
+ # We might have some stuff not built in this build, but that we want

to install

(quoted diff) +0 -0

b/package/mysql_client/mysql_client-ac_stack_direction-is-unset.patch new file mode 100644
index 0000000..6fef0a9

package/mysql_client/mysql_client-ac_stack_direction-is-unset.patch new file +15 -0

@@ -0,0 +1,15 @@
+misc.m4: ac_cv_c_stack_direction is unset.
+
+Signed-off-by: Marcelo Gutierrez (UTN/FRH) <[email protected]>
+
+--- mysql-5.1.70.orig/config/ac-macros/misc.m4
++++ mysql-5.1.70/config/ac-macros/misc.m4
+@@ -477,7 +477,7 @@
+     exit(ptr_f(&a) < 0);
+   }
+   ], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
+-   ac_cv_c_stack_direction=)])
++   ac_cv_c_stack_direction=0)])
+  AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
+ ])dnl
+

(quoted diff) +0 -0

b/package/mysql_client/mysql_client.mk
index bd4c565..127f65e 100644

package/mysql_client/mysql_client.mk +45 -1

66 lines not on this page · raw message

MYSQL_CLIENT_REMOVE_TEST_PROGS
MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_ADD_MYSQL_LIB_PATH

$(eval $(autotools-package))
+$(eval $(host-autotools-package))

Signature · 1 line

1.7.10.4

Yann E. MORIN

2014-01-19 11:51 UTC #1 lore raw

PATCH 2/2 Update MySQL client package

Marcelo, All,

On 2014-01-18 19:24 -0200, Marcelo Gutierrez spake thusly:

Quoted 11 lines

Changes v1 -> v2:
- fix comments following new policy
- rename patches
- remove useless hook points
- add the URL to the home of MySQL
- add commit-log description to the patches
- install host tools to $(HOST_DIR)/usr/bin
- fix only builds the required program
Signed-off-by Marcelo Guti?rrez(UTN/FRH) <[email protected]>

The patch is space-mangled: tabs were replaced by spaces. So we can't apply it.

Please fix your mailer, or better yet, use 'git send-email' to send your patches.

However, still a few comments, below...

Quoted 5 lines

---
 package/mysql_client/Config.in                     |   20 +++++++--
 package/mysql_client/S60mysqld                     |   25 +++++++++++
 .../mysql_client-Fix-gen_lex_hash-execution.patch  |   28 ++++++++++++
 .../mysql_client-ac_stack_direction-is-unset.patch |   15 +++++++

As I said in my previous review, the patches should be named as:
mysql_client-0000-ac_stack_direction-is-unset.patch mysql_client-0001-Fix-gen_lex_hash-execution.patch

Ie. they should be numbered.

I know the existing patches are not, so just provide a preliminary patch that renames them, please.

Quoted 13 lines

 package/mysql_client/mysql_client.mk               |   47 +++++++++++++++++++-
 5 files changed, 130 insertions(+), 5 deletions(-)
 create mode 100644 package/mysql_client/S60mysqld
 create mode 100644
package/mysql_client/mysql_client-Fix-gen_lex_hash-execution.patch
 create mode 100644

package/mysql_client/mysql_client-ac_stack_direction-is-unset.patch

package/mysql_client/Config.in +0 -0

index 543bed1..8ebe70f 100644

package/mysql_client/Config.in line 2

Quoted 4 lines

package/mysql_client/Config.in +2 -2

@@ -1,13 +1,25 @@
-config BR2_PACKAGE_MYSQL_CLIENT
-       bool "MySQL client"
+config BR2_PACKAGE_MYSQL
+       bool "MySQL"

You can't rename the option: it should match the name of the package. The package infrastructure uses that to decide if a package should be built or not.

But since the mysql_client package may now also be able to build the server part, it could make sense to rename the package. But even then, it should be done in a different patch, eg:
- patch-1: rename the package and the existing patches
- patch-3: add support for building the server

In patch-1, don;t forget to add the option in Config.in.legacy.

package/mysql_client/Config.in line 12

Quoted 12 lines

package/mysql_client/Config.in +3 -2

        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_USE_MMU # fork()
        depends on BR2_TOOLCHAIN_HAS_THREADS
        select BR2_PACKAGE_NCURSES
        select BR2_PACKAGE_READLINE
        help
-         MySQL client
+         The MySQL Open Source Database System
+         http://www.mysql.com/
 
-comment "MySQL client needs a toolchain w/ C++, threads"
+comment "MySQL server and MySQL client needs a toolchain w/ C++, threads"

What about just:
"MySQL needs a toolchain w/ C++, threads"

package/mysql_client/Config.in line 24

Quoted 12 lines

package/mysql_client/Config.in +10 -0

        depends on BR2_USE_MMU
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+
+if BR2_PACKAGE_MYSQL
+
+config BR2_PACKAGE_MYSQL_CLIENT
+        bool "MySQL client"
+
+config BR2_PACKAGE_MYSQL_CLIENT_SERVER
+       bool "MySQL server"
+
+endif

What if neither the client nor the server is selected? Does that make sense? If not, then always build the client (as we currently do), and make the server an option (as you did in your previous patch).

Quoted 21 lines

package/mysql_client/S60mysqld new file +15 -0

new file mode 100644
index 0000000..38e1c41
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# Starts mysqld.
+#
+
+case "$1" in
+       start)
+               /usr/bin/mysqld_safe &
+               ;;
+       stop)
+               if test -f /var/lib/mysql/mysqld.pid ; then
+                       PID=`cat /var/lib/mysql/mysqld.pid`
+                       kill $PID
+               fi
+               ;;

package/mysql_client/S60mysqld line 25

Quoted 10 lines

package/mysql_client/S60mysqld new file +10 -0

+       restart)
+               $0 stop
+               $0 start
+               ;;
+       *)
+               echo "Usage: /etc/init.d/mysqld {start|stop|restart}"
+               ;;
+esac
+
+exit 0

"exit 0" is not needed.

package/mysql_client/mysql_client-Fix-gen_lex_hash-execution.patch line 2

Quoted 9 lines

package/mysql_client/mysql_client-Fix-gen_lex_hash-execution.patch new file +2 -0

new file mode 100644
index 0000000..377cabb
@@ -0,0 +1,28 @@
+When MySQL server is enabled, I first compile the tool with the host gcc
+and then copy into the "$(HOST_DIR)/usr/bin/" folder

This is more descriptive, as it states the reason, and explains the fix:

Makefile: fix cross-compiling the server

MySQL Makefile believes it can run code it just compiled, to generate a header. This does not work for cross-compilation.

Instead, use a pre-installed host-version of the required tool.

[--SNIP--]

Quoted 37 lines

package/mysql_client/mysql_client.mk +14 -1

index bd4c565..127f65e 100644
@@ -14,6 +14,15 @@ MYSQL_CLIENT_AUTORECONF = YES
 MYSQL_CLIENT_LICENSE = GPLv2
 MYSQL_CLIENT_LICENSE_FILES = README COPYING
 
+
+ifeq ($(BR2_PACKAGE_MYSQL_CLIENT_SERVER),y)
+MYSQL_CLIENT_DEPENDENCIES += host-mysql_client
+HOST_MYSQL_CLIENT_DEPENDENCIES =
+
+HOST_MYSQL_CLIENT_CONF_OPT = \
+       --with-embedded-server
+endif
+
 MYSQL_CLIENT_CONF_ENV = \
        ac_cv_sys_restartable_syscalls=yes \
        ac_cv_path_PS=/bin/ps \

@@ -25,15 +34,50 @@ MYSQL_CLIENT_CONF_ENV = \
 
 MYSQL_CLIENT_CONF_OPT = \
        --without-ndb-binlog \
-       --without-server \
        --without-docs \
        --without-man \
        --without-libedit \
        --without-readline \
+       --without-libedit \
+       --disable-dependency-tracking \
        --with-low-memory \
+       --with-atomic-ops=up \
        --enable-thread-safe-client \
+       --without-query-cache \
+       --without-plugin-partition \

package/mysql_client/mysql_client.mk MYSQL_CLIENT_CONF_ENV = \ · line 57

Quoted 10 lines

package/mysql_client/mysql_client.mk +10 -0

+       --without-plugin-daemon_example \
+       --without-plugin-ftexample \
+       --without-plugin-archive \
+       --without-plugin-blackhole \
+       --without-plugin-example \
+       --without-plugin-federated \
+       --without-plugin-ibmdb2i \
+       --without-plugin-innobase \
+       --without-plugin-innodb_plugin \
+       --without-plugin-ndbcluster \

I would move all those new options in the ifeq ($(BR2_PACKAGE_MYSQL_CLIENT_SERVER),y) below...

package/mysql_client/mysql_client.mk MYSQL_CLIENT_CONF_ENV = \ · line 61

Quoted 4 lines

package/mysql_client/mysql_client.mk +2 -0

        $(ENABLE_DEBUG)
 
+ifeq ($(BR2_PACKAGE_MYSQL_CLIENT_SERVER),y)
+       MYSQL_CLIENT_CONF_OPT += --with-embedded-server

... here ^^^

Quoted 25 lines

package/mysql_client/mysql_client.mk +18 -0

+define HOST_MYSQL_CLIENT_BUILD_CMDS
+       $(MAKE) -C $(@D)/include my_config.h
+       $(MAKE) -C $(@D)/mysys libmysys.a
+       $(MAKE) -C $(@D)/strings libmystrings.a
+       $(MAKE) -C $(@D)/vio libvio.a
+       $(MAKE) -C $(@D)/dbug libdbug.a
+       $(MAKE) -C $(@D)/regex libregex.a
+       $(MAKE) -C $(@D)/sql gen_lex_hash
+endef
+
+define HOST_MYSQL_CLIENT_INSTALL_CMDS
+       $(INSTALL) -m 0755  $(@D)/sql/gen_lex_hash  $(HOST_DIR)/usr/bin/
+endef
+
+else
+MYSQL_CLIENT_CONF_OPT += --without-server
+endif
+
 define MYSQL_CLIENT_REMOVE_TEST_PROGS
        rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench
 endef

@@ -46,3 +90,4 @@ MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS +=

MYSQL_CLIENT_REMOVE_TEST_PROGS
MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_ADD_MYSQL_LIB_PATH

Quoted 2 lines

$(eval $(autotools-package))
+$(eval $(host-autotools-package))

This is getting really good! :-)

Regards,
Yann E. MORIN.

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Thomas Petazzoni

2014-01-30 21:07 UTC #2 lore raw

PATCH 2/2 Update MySQL client package

Dear Yann E. MORIN,

Quoted 8 lines · Yann E. MORIN

Quoted 8 lines
depends on BR2_USE_MMU
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
package/mysql_client/Config.in +6 -0
+
+if BR2_PACKAGE_MYSQL
+
+config BR2_PACKAGE_MYSQL_CLIENT
+        bool "MySQL client"
+

Quoted 8 lines

package/mysql_client/Config.in line 24
Quoted 4 lines
package/mysql_client/Config.in +4 -0
+config BR2_PACKAGE_MYSQL_CLIENT_SERVER
+       bool "MySQL server"
+
+endif
What if neither the client nor the server is selected? Does that make sense? If not, then always build the client (as we currently do), and make the server an option (as you did in your previous patch).

I would suggest:

config BR2_PACKAGE_MYSQL
bool "mysql"
select BR2_PACKAGE_MYSQL_CLIENT if !BR2_PACKAGE_MYSQL_SERVER

if BR2_PACKAGE_MYSQL

config BR2_PACKAGE_MYSQL_CLIENT
bool "client"

config BR2_PACKAGE_MYSQL_SERVER
bool "server"

endif

This way, we guarantee that at least either the client or the server are enabled.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Marcelo Gutierrez

author

2014-02-01 23:02 UTC #3 lore raw

PATCH 2/2 Update MySQL client package

Hi Thomas, all

This is the new Config.in file:

config BR2_PACKAGE_MYSQL
bool "mysql"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_MMU # fork()
depends on BR2_TOOLCHAIN_HAS_THREADS
select BR2_PACKAGE_MYSQL_CLIENT if !BR2_PACKAGE_MYSQL_SERVER select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_READLINE
help
The MySQL Open Source Database System

http://www.mysql.com/

comment "MySQL needs a toolchain w/ C++, threads"
depends on BR2_USE_MMU
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

if BR2_PACKAGE_MYSQL_CLIENT

config BR2_PACKAGE_MYSQL_CLIENT
bool "client"
help
Install the MySQL client on the target.

config BR2_PACKAGE_MYSQL_SERVER
bool "server"
help
Install the MySQL server on the target.

endif

But I'm getting this issue:

$ make menuconfig
package/mysql/Config.in:1:error: recursive dependency detected!
package/mysql/Config.in:1:      symbol BR2_PACKAGE_MYSQL is selected
by BR2_PACKAGE_MYSQL_CLIENT
package/mysql/Config.in:21:     symbol BR2_PACKAGE_MYSQL_CLIENT is
selected by BR2_PACKAGE_MYSQL

Best,
Marcelo

2014-01-30 Thomas Petazzoni <[email protected]>:

Quoted 45 lines

Dear Yann E. MORIN,
Quoted 8 lines · Yann E. MORIN
Quoted 8 lines
depends on BR2_USE_MMU
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
package/mysql_client/Config.in +6 -0
+
+if BR2_PACKAGE_MYSQL
+
+config BR2_PACKAGE_MYSQL_CLIENT
+        bool "MySQL client"
+
Quoted 8 lines
package/mysql_client/Config.in line 24
Quoted 4 lines
package/mysql_client/Config.in +4 -0
+config BR2_PACKAGE_MYSQL_CLIENT_SERVER
+       bool "MySQL server"
+
+endif
What if neither the client nor the server is selected? Does that make sense? If not, then always build the client (as we currently do), and make the server an option (as you did in your previous patch).
I would suggest:
config BR2_PACKAGE_MYSQL
bool "mysql"
select BR2_PACKAGE_MYSQL_CLIENT if !BR2_PACKAGE_MYSQL_SERVER
if BR2_PACKAGE_MYSQL
config BR2_PACKAGE_MYSQL_CLIENT
bool "client"
config BR2_PACKAGE_MYSQL_SERVER
bool "server"
endif
This way, we guarantee that at least either the client or the server are enabled.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com