aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Marcelo Gutiérrez(UTN/FRH) <kuyurix@gmail.com>2014-01-21 14:08:28 +0000
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-01-21 23:40:01 +0100
commit06c8212866389948d7ad80573ea0c3faa7411a9c (patch)
tree51da6cea8a08d8426414334d90dff2972e455dc7
parent6a471a1cb2b859941353343d0c1c84e6cd834204 (diff)
downloadbuildroot-06c8212866389948d7ad80573ea0c3faa7411a9c.tar.gz
buildroot-06c8212866389948d7ad80573ea0c3faa7411a9c.tar.bz2
Rename MySQL client package
MySQL client package has been renamed to MySQL. [Peter: fixup help text] Signed-off-by: Marcelo Gutiérrez <kuyurix@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--Config.in.legacy7
-rw-r--r--package/Config.in2
-rw-r--r--package/mysql/Config.in (renamed from package/mysql_client/Config.in)10
-rw-r--r--package/mysql/mysql-ac_cache_check.patch (renamed from package/mysql_client/mysql_client-ac_cache_check.patch)0
-rw-r--r--package/mysql/mysql-configure-ps-cache-check.patch (renamed from package/mysql_client/mysql_client-configure-ps-cache-check.patch)0
-rw-r--r--package/mysql/mysql-use-new-readline-iface.patch (renamed from package/mysql_client/mysql_client-use-new-readline-iface.patch)0
-rw-r--r--package/mysql/mysql.mk (renamed from package/mysql_client/mysql_client.mk)32
7 files changed, 30 insertions, 21 deletions
diff --git a/Config.in.legacy b/Config.in.legacy
index 40bc80516a..89181843be 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -125,6 +125,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
diff --git a/package/Config.in b/package/Config.in
index c45f8bd166..51ba120ce5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -502,7 +502,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"
diff --git a/package/mysql_client/Config.in b/package/mysql/Config.in
index 543bed1e6d..0def95787b 100644
--- a/package/mysql_client/Config.in
+++ b/package/mysql/Config.in
@@ -1,13 +1,15 @@
-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
-comment "MySQL client needs a toolchain w/ C++, threads"
+ 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
diff --git a/package/mysql_client/mysql_client-ac_cache_check.patch b/package/mysql/mysql-ac_cache_check.patch
index c3b55ba8d3..c3b55ba8d3 100644
--- a/package/mysql_client/mysql_client-ac_cache_check.patch
+++ b/package/mysql/mysql-ac_cache_check.patch
diff --git a/package/mysql_client/mysql_client-configure-ps-cache-check.patch b/package/mysql/mysql-configure-ps-cache-check.patch
index 336e80e0b7..336e80e0b7 100644
--- a/package/mysql_client/mysql_client-configure-ps-cache-check.patch
+++ b/package/mysql/mysql-configure-ps-cache-check.patch
diff --git a/package/mysql_client/mysql_client-use-new-readline-iface.patch b/package/mysql/mysql-use-new-readline-iface.patch
index c5906563ce..c5906563ce 100644
--- a/package/mysql_client/mysql_client-use-new-readline-iface.patch
+++ b/package/mysql/mysql-use-new-readline-iface.patch
diff --git a/package/mysql_client/mysql_client.mk b/package/mysql/mysql.mk
index bd4c56509c..aaf6ba9773 100644
--- a/package/mysql_client/mysql_client.mk
+++ b/package/mysql/mysql.mk
@@ -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))