From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8D224139B2A for ; Fri, 18 Sep 2015 18:45:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0B1C5E08E1; Fri, 18 Sep 2015 18:45:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A6F0E08E1 for ; Fri, 18 Sep 2015 18:45:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A6B78340B65 for ; Fri, 18 Sep 2015 18:45:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 73E88186 for ; Fri, 18 Sep 2015 18:45:30 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1442601919.542753bbbe878dea1192c9d0c96586c0a1f0e038.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-multilib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 542753bbbe878dea1192c9d0c96586c0a1f0e038 X-VCS-Branch: master Date: Fri, 18 Sep 2015 18:45:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fece0403-c28e-4c89-8948-b9e0e175c3ce X-Archives-Hash: e54006f75bdd10704d2e6533d2dd6103 commit: 542753bbbe878dea1192c9d0c96586c0a1f0e038 Author: Brian Evans gentoo org> AuthorDate: Fri Sep 18 18:45:19 2015 +0000 Commit: Brian Evans gentoo org> CommitDate: Fri Sep 18 18:45:19 2015 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=542753bb More config cleanup; fix variables Signed-off-by: Brian Evans gentoo.org> eclass/mysql-multilib.eclass | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index 16c320f..17206cf 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -1025,7 +1025,7 @@ mysql-multilib_pkg_config() { help_tables="${TMPDIR}/fill_help_tables.sql" # Figure out which options we need to disable to do the setup - helpfile="${TMPDIR}/mysqld-help" + local helpfile="${TMPDIR}/mysqld-help" ${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null for opt in grant-tables host-cache name-resolve networking slave-start \ federated ssl log-bin relay-log slow-query-log external-locking \ @@ -1040,11 +1040,6 @@ mysql-multilib_pkg_config() { use prefix || options="${options} --user=mysql" - # MySQL 5.6+ needs InnoDB - if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] ; then - mysql_version_is_at_least "5.6" || options="${options} --loose-skip-innodb" - fi - einfo "Creating the mysql database and setting proper permissions on it ..." # Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it @@ -1062,11 +1057,12 @@ mysql-multilib_pkg_config() { "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null local cmd + local initialize_options if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && mysql_version_is_at_least "5.7.6" ; then # --initialize-insecure will not set root password # --initialize would set a random one in the log which we don't need as we set it ourselves cmd="${EROOT}usr/sbin/mysqld" - options="${options} --initialize-insecure '--init-file=${sqltmp}'" + initialize_options="--initialize-insecure '--init-file=${sqltmp}'" sqltmp="" # the initialize will take care of it else cmd="${EROOT}usr/share/mysql/scripts/mysql_install_db" @@ -1075,7 +1071,7 @@ mysql-multilib_pkg_config() { cat "${help_tables}" >> "${sqltmp}" fi fi - cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${ROOT}/${MY_DATADIR}' '--tmpdir=${ROOT}/${MYSQL_TMPDIR}'" + cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${ROOT}/${MY_DATADIR}' '--tmpdir=${ROOT}/${MYSQL_TMPDIR}' ${initialize_options}" einfo "Command: $cmd" eval $cmd \ >"${TMPDIR}"/mysql_install_db.log 2>&1