diff options
| author |   Brian Evans <grknight@tuffmail.com> | 2014-02-04 16:12:55 -0500 |
|---|---|---|
| committer | Brian Evans <grknight@tuffmail.com> | 2014-02-04 16:12:55 -0500 |
| commit | a4fe4b9bb99d03493b67f88c47ef50aceab16958 (patch) | |
| tree | 02ba06715c0ef7cc843f01721acd7ff4b83f8cc0 /eclass/mysql-v2.eclass | |
| parent | Clean-up mariadb versions. (diff) | |
| download | mysql-a4fe4b9bb99d03493b67f88c47ef50aceab16958.tar.gz mysql-a4fe4b9bb99d03493b67f88c47ef50aceab16958.tar.bz2 mysql-a4fe4b9bb99d03493b67f88c47ef50aceab16958.zip | |
[eclass] Fix bug 446200 and remove unnecessary ()
Diffstat (limited to 'eclass/mysql-v2.eclass')
| -rw-r--r-- | eclass/mysql-v2.eclass | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index ddb7e67..39fcbf0 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -365,7 +365,7 @@ pbxt_patch_available() { } pbxt_available() { - pbxt_patch_available || ( [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && mysql_check_version_range "5.1 to 5.5.32" ) + pbxt_patch_available || [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && mysql_check_version_range "5.1 to 5.5.32" return $? } @@ -769,6 +769,10 @@ mysql-v2_pkg_config() { use prefix || options="${options} --user=mysql" + # Fix bug 446200. Don't reference host my.cnf + use prefix && [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] \ + && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'" + pushd "${TMPDIR}" &>/dev/null #cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}" cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db |