| 1 |
commit: ef63412e7200ee99e779b9187293da57a229121b |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 26 18:46:34 2016 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 27 16:44:03 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=ef63412e |
| 7 |
|
| 8 |
mysql-multilib-r1.eclass: Use *_is_at_least from versionator eclass |
| 9 |
|
| 10 |
Since dev-db/percona-server was bumped to EAPI=6 usage mysql_fx eclass is |
| 11 |
no longer inherited [Link1] which results in an error like |
| 12 |
|
| 13 |
> # emerge --config dev-db/percona-server |
| 14 |
> |
| 15 |
> Configuring pkg... |
| 16 |
> |
| 17 |
> * Creating the mysql database and setting proper permissions on it ... |
| 18 |
> /var/tmp/portage/dev-db/percona-server-5.6.32.78.0/temp/environment: line 4697: mysql_version_is_at_least: command not found |
| 19 |
|
| 20 |
To fix this problem I replaced the call to "mysql_version_is_at_least" |
| 21 |
function from mysql_fx eclass with a call to "version_is_at_least" function |
| 22 |
from versionator eclass we are already inheriting [Link2]. |
| 23 |
|
| 24 |
Link1: https://gitweb.gentoo.org/repo/gentoo.git/tree/eclass/mysql-multilib-r1.eclass?id=b3ae687988d49123628757aa8c5422bdd3b444fb#n46 |
| 25 |
|
| 26 |
Link2: https://gitweb.gentoo.org/repo/gentoo.git/tree/eclass/mysql-multilib-r1.eclass?id=b3ae687988d49123628757aa8c5422bdd3b444fb#n43 |
| 27 |
|
| 28 |
Gentoo-Bug: https://bugs.gentoo.org/594298 |
| 29 |
|
| 30 |
eclass/mysql-multilib-r1.eclass | 2 +- |
| 31 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 32 |
|
| 33 |
diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass |
| 34 |
index 858b9b6..3f7372c 100644 |
| 35 |
--- a/eclass/mysql-multilib-r1.eclass |
| 36 |
+++ b/eclass/mysql-multilib-r1.eclass |
| 37 |
@@ -918,7 +918,7 @@ mysql-multilib-r1_pkg_config() { |
| 38 |
|
| 39 |
local cmd |
| 40 |
local initialize_options |
| 41 |
- if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.7.6" ; then |
| 42 |
+ if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && version_is_at_least "5.7.6" ; then |
| 43 |
# --initialize-insecure will not set root password |
| 44 |
# --initialize would set a random one in the log which we don't need as we set it ourselves |
| 45 |
cmd="${EROOT}usr/sbin/mysqld" |
Archives