Skip to contentSkip to conversation

Rename MySQL client package

PATCH New Marcelo Gutiérrez 3 participants 3 messages Jan 21, 2014

lore
Share & tools
lore

Marcelo Gutiérrez

author
#0 lore raw

PATCH v2 1/3 Rename MySQL client package

MySQL client package has been renamed to MySQL.

Signed-off-by Marcelo Guti?rrez <[email protected]>

---
Changes v1 -> v2:

- fix leading tab, not spaces

 Config.in.legacy                                   |    7 +++++
 package/Config.in                                  |    2 +-
 package/{mysql_client => mysql}/Config.in          |    9 +++---
 .../mysql-ac_cache_check.patch}                    |    0
 .../mysql-configure-ps-cache-check.patch}          |    0
 .../mysql-use-new-readline-iface.patch}            |    0
 .../mysql_client.mk => mysql/mysql.mk}             |   32 ++++++++++----------
 7 files changed, 29 insertions(+), 21 deletions(-)
 rename package/{mysql_client => mysql}/Config.in (61%)
 rename package/{mysql_client/mysql_client-ac_cache_check.patch => mysql/mysql-ac_cache_check.patch} (100%)
 rename package/{mysql_client/mysql_client-configure-ps-cache-check.patch => mysql/mysql-configure-ps-cache-check.patch} (100%)
 rename package/{mysql_client/mysql_client-use-new-readline-iface.patch => mysql/mysql-use-new-readline-iface.patch} (100%)
 rename package/{mysql_client/mysql_client.mk => mysql/mysql.mk} (54%)
Config.in.legacy +7 -0
index 2fed2d8..abd39d9 100644
@@ -111,6 +111,13 @@ config BR2_PACKAGE_LIBNFC_LLCP
           to 'libllcp'. We have added a new package for 'libllcp' and bumped
           the version at the same time.
 
+config BR2_PACKAGE_MYSQL_CLIENT
+	bool "MySQL client renamed to MySQL"
+	select BR2_LEGACY
+	select BR2_PACKAGE_MYSQL
+	help
+	  The option has been renamed BR2_PACKAGE_MYSQL
+
 config BR2_PACKAGE_SQUASHFS3
 	bool "squashfs3 has been removed"
 	select BR2_LEGACY
package/Config.in +1 -1
index 8495cdd..74fbcda 100644
@@ -503,7 +503,7 @@ menu "Database"
 source "package/berkeleydb/Config.in"
 source "package/cppdb/Config.in"
 source "package/gdbm/Config.in"
-source "package/mysql_client/Config.in"
+source "package/mysql/Config.in"
 source "package/redis/Config.in"
 source "package/sqlcipher/Config.in"
 source "package/sqlite/Config.in"
package/mysql/Config.in renamed from package/mysql_client/Config.in +5 -4
similarity index 61%
rename from package/mysql_client/Config.in
rename to package/mysql/Config.in
index 543bed1..229e050 100644
@@ -1,13 +1,14 @@
-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 needs a toolchain w/ C++, threads"
 	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
package/mysql/mysql-ac_cache_check.patch renamed from package/mysql_client/mysql_client-ac_cache_check.patch +0 -0
similarity index 100%
rename from package/mysql_client/mysql_client-ac_cache_check.patch
rename to package/mysql/mysql-ac_cache_check.patch
package/mysql/mysql-configure-ps-cache-check.patch renamed from package/mysql_client/mysql_client-configure-ps-cache-check.patch +0 -0
similarity index 100%
rename from package/mysql_client/mysql_client-configure-ps-cache-check.patch
rename to package/mysql/mysql-configure-ps-cache-check.patch
package/mysql/mysql-use-new-readline-iface.patch renamed from package/mysql_client/mysql_client-use-new-readline-iface.patch +0 -0
similarity index 100%
rename from package/mysql_client/mysql_client-use-new-readline-iface.patch
rename to package/mysql/mysql-use-new-readline-iface.patch
package/mysql/mysql.mk renamed from package/mysql_client/mysql_client.mk +16 -16
similarity index 54%
rename from package/mysql_client/mysql_client.mk
rename to package/mysql/mysql.mk
index bd4c565..aaf6ba9 100644
@@ -1,20 +1,20 @@
 ################################################################################
 #
-# mysql_client
+# mysql
 #
 ################################################################################
 
-MYSQL_CLIENT_VERSION_MAJOR = 5.1
-MYSQL_CLIENT_VERSION = $(MYSQL_CLIENT_VERSION_MAJOR).70
-MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz
-MYSQL_CLIENT_SITE = http://downloads.skysql.com/archives/mysql-$(MYSQL_CLIENT_VERSION_MAJOR)
-MYSQL_CLIENT_INSTALL_STAGING = YES
-MYSQL_CLIENT_DEPENDENCIES = readline ncurses
-MYSQL_CLIENT_AUTORECONF = YES
-MYSQL_CLIENT_LICENSE = GPLv2
-MYSQL_CLIENT_LICENSE_FILES = README COPYING
+MYSQL_VERSION_MAJOR = 5.1
+MYSQL_VERSION = $(MYSQL_VERSION_MAJOR).70
+MYSQL_SOURCE = mysql-$(MYSQL_VERSION).tar.gz
+MYSQL_SITE = http://downloads.skysql.com/archives/mysql-$(MYSQL_VERSION_MAJOR)
+MYSQL_INSTALL_STAGING = YES
+MYSQL_DEPENDENCIES = readline ncurses
+MYSQL_AUTORECONF = YES
+MYSQL_LICENSE = GPLv2
+MYSQL_LICENSE_FILES = README COPYING
 
-MYSQL_CLIENT_CONF_ENV = \
+MYSQL_CONF_ENV = \
 	ac_cv_sys_restartable_syscalls=yes \
 	ac_cv_path_PS=/bin/ps \
 	ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null" \

@@ -23,7 +23,7 @@ MYSQL_CLIENT_CONF_ENV = \
 	ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes \
 	mysql_cv_new_rl_interface=yes
 
-MYSQL_CLIENT_CONF_OPT = \
+MYSQL_CONF_OPT = \
 	--without-ndb-binlog \
 	--without-server \
 	--without-docs \

@@ -34,15 +34,15 @@ MYSQL_CLIENT_CONF_OPT = \
 	--enable-thread-safe-client \
 	$(ENABLE_DEBUG)
 
-define MYSQL_CLIENT_REMOVE_TEST_PROGS
+define MYSQL_REMOVE_TEST_PROGS
 	rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench
 endef
 
-define MYSQL_CLIENT_ADD_MYSQL_LIB_PATH
+define MYSQL_ADD_MYSQL_LIB_PATH
 	echo "/usr/lib/mysql" >> $(TARGET_DIR)/etc/ld.so.conf
 endef
 
-MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_REMOVE_TEST_PROGS
-MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_ADD_MYSQL_LIB_PATH
+MYSQL_POST_INSTALL_TARGET_HOOKS += MYSQL_REMOVE_TEST_PROGS
+MYSQL_POST_INSTALL_TARGET_HOOKS += MYSQL_ADD_MYSQL_LIB_PATH
 
 $(eval $(autotools-package))
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v2 1/3 Rename MySQL client package

Marcelo, All,

On 2014-01-21 14:08 +0000, Marcelo Guti?rrez spake thusly:

Quoted 3 lines

MySQL client package has been renamed to MySQL.

Signed-off-by Marcelo Guti?rrez <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>

However, a minor nit, see below...

Quoted 10 lines
package/mysql/Config.in renamed from package/mysql_client/Config.in +0 -2
similarity index 61%
rename from package/mysql_client/Config.in
rename to package/mysql/Config.in
index 543bed1..229e050 100644
@@ -1,13 +1,14 @@
-config BR2_PACKAGE_MYSQL_CLIENT
-	bool "MySQL client"

package/mysql/Config.in line 9

Quoted 10 lines
package/mysql/Config.in renamed from package/mysql_client/Config.in +3 -1
+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

This hould be a leading tab and two spaces. No need to resend, Peter can fix while committing, I guess! ;-)

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.  |
'------------------------------^-------^------------------^--------------------'