| 1 |
commit: 67580a5160a986950192117a7757041d0fcf9b98 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 4 00:48:52 2014 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
| 5 |
CommitDate: Wed Jun 4 00:50:17 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=67580a51 |
| 7 |
|
| 8 |
Remove app-text/sphinx as a build DEPEND and sync mysql-multilib |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mysql-multilib.eclass | 22 ++++++++++++++++------ |
| 12 |
eclass/mysql-v2.eclass | 1 - |
| 13 |
2 files changed, 16 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
| 16 |
index 1f664cb..feb9ba5 100644 |
| 17 |
--- a/eclass/mysql-multilib.eclass |
| 18 |
+++ b/eclass/mysql-multilib.eclass |
| 19 |
@@ -111,6 +111,7 @@ if [[ -z ${SERVER_URI} ]]; then |
| 20 |
MARIA_FULL_P="${PN}-${MARIA_FULL_PV}" |
| 21 |
SERVER_URI=" |
| 22 |
http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz |
| 23 |
+ http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz |
| 24 |
http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz |
| 25 |
http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz |
| 26 |
http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz |
| 27 |
@@ -226,7 +227,6 @@ if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 28 |
# Bug 441700 MariaDB >=5.3 include custom mytop |
| 29 |
DEPEND="${DEPEND} |
| 30 |
oqgraph? ( >=dev-libs/boost-1.40.0:0= ) |
| 31 |
- sphinx? ( app-misc/sphinx:0= ) |
| 32 |
!minimal? ( pam? ( virtual/pam:0= ) ) |
| 33 |
perl? ( !dev-db/mytop )" |
| 34 |
if mysql_version_is_at_least "10.0.5" ; then |
| 35 |
@@ -576,6 +576,16 @@ mysql-multilib_pkg_postinst() { |
| 36 |
elog "If you are upgrading major versions, you should run the" |
| 37 |
elog "mysql_upgrade tool." |
| 38 |
einfo |
| 39 |
+ |
| 40 |
+ if [[ ${PN} == "mariadb-galera" ]] ; then |
| 41 |
+ einfo |
| 42 |
+ elog "Be sure to edit the my.cnf file to activate your cluster settings." |
| 43 |
+ elog "This should be done after running \"emerge --config =${CATEGORY}/${PF}\"" |
| 44 |
+ elog "The first time the cluster is activated, you should add" |
| 45 |
+ elog "--wsrep-new-cluster to the options in /etc/conf.d/mysql for one node." |
| 46 |
+ elog "This option should then be removed for subsequent starts." |
| 47 |
+ einfo |
| 48 |
+ fi |
| 49 |
fi |
| 50 |
} |
| 51 |
|
| 52 |
@@ -641,7 +651,7 @@ mysql-multilib_pkg_config() { |
| 53 |
ewarn "Attempting to use ${MY_DATADIR_s}" |
| 54 |
else |
| 55 |
eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist" |
| 56 |
- die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}" |
| 57 |
+ die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}" |
| 58 |
fi |
| 59 |
fi |
| 60 |
fi |
| 61 |
@@ -726,7 +736,7 @@ mysql-multilib_pkg_config() { |
| 62 |
|
| 63 |
use prefix || options="${options} --user=mysql" |
| 64 |
|
| 65 |
- # Fix bug 446200. Don't reference host my.cnf |
| 66 |
+ # Fix bug 446200. Don't reference host my.cnf |
| 67 |
use prefix && [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] \ |
| 68 |
&& options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'" |
| 69 |
|
| 70 |
@@ -741,9 +751,9 @@ mysql-multilib_pkg_config() { |
| 71 |
# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it |
| 72 |
PID_DIR="${EROOT}/var/run/mysqld" |
| 73 |
if [[ ! -d "${PID_DIR}" ]]; then |
| 74 |
- mkdir -p "${PID_DIR}" |
| 75 |
- chown mysql:mysql "${PID_DIR}" |
| 76 |
- chmod 755 "${PID_DIR}" |
| 77 |
+ mkdir -p "${PID_DIR}" || die "Could not create pid directory" |
| 78 |
+ chown mysql:mysql "${PID_DIR}" || die "Could not set ownership on pid directory" |
| 79 |
+ chmod 755 "${PID_DIR}" || die "Could not set permissions on pid directory" |
| 80 |
fi |
| 81 |
|
| 82 |
pushd "${TMPDIR}" &>/dev/null |
| 83 |
|
| 84 |
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass |
| 85 |
index a1558de..f0c919a 100644 |
| 86 |
--- a/eclass/mysql-v2.eclass |
| 87 |
+++ b/eclass/mysql-v2.eclass |
| 88 |
@@ -264,7 +264,6 @@ fi |
| 89 |
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then |
| 90 |
mysql_check_version_range "5.1.38 to 5.3.99" && DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )" |
| 91 |
mysql_version_is_at_least "5.2" && DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )" |
| 92 |
- mysql_version_is_at_least "5.2.5" && DEPEND="${DEPEND} sphinx? ( app-misc/sphinx )" |
| 93 |
mysql_version_is_at_least "5.2.10" && DEPEND="${DEPEND} !minimal? ( pam? ( virtual/pam ) )" |
| 94 |
# Bug 441700 MariaDB >=5.3 include custom mytop |
| 95 |
mysql_version_is_at_least "5.3" && DEPEND="${DEPEND} perl? ( !dev-db/mytop )" |
Archives