commit: 623f3c3838de2dddf7c5949f4e5ec47bd5a083b5 Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Mon May 19 16:23:57 2014 +0000 Commit: Brian Evans <grknight <AT> lavabit <DOT> com> CommitDate: Mon May 19 17:01:54 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=623f3c38
[eclass] Force tmpdir to make sure the portage directory is not used --- eclass/mysql-multilib.eclass | 7 ++++--- eclass/mysql-v2.eclass | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index 9b660d9..1f664cb 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -750,7 +750,7 @@ mysql-multilib_pkg_config() { #cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}" cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db [[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db - cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options}" + cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${EROOT}/${MY_DATADIR}' '--tmpdir=${EROOT}/${MYSQL_TMPDIR}'" einfo "Command: $cmd" eval $cmd \ >"${TMPDIR}"/mysql_install_db.log 2>&1 @@ -779,12 +779,13 @@ mysql-multilib_pkg_config() { --user=mysql \ --log-warnings=0 \ --basedir=${EROOT}/usr \ - --datadir=${ROOT}/${MY_DATADIR} \ + --datadir=${EROOT}/${MY_DATADIR} \ --max_allowed_packet=8M \ --net_buffer_length=16K \ --default-storage-engine=MyISAM \ --socket=${socket} \ - --pid-file=${pidfile}" + --pid-file=${pidfile} + --tmpdir=${EROOT}/${MYSQL_TMPDIR}" #einfo "About to start mysqld: ${mysqld}" ebegin "Starting mysqld" einfo "Command ${mysqld}" diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 3a9954a..a1558de 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -802,7 +802,7 @@ mysql-v2_pkg_config() { #cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}" cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db [[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db - cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${EROOT}/${MY_DATADIR}'" + cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${EROOT}/${MY_DATADIR}' '--tmpdir=${EROOT}/${MYSQL_TMPDIR}'" einfo "Command: $cmd" eval $cmd \ >"${TMPDIR}"/mysql_install_db.log 2>&1 @@ -831,12 +831,13 @@ mysql-v2_pkg_config() { --user=mysql \ --log-warnings=0 \ --basedir=${EROOT}/usr \ - --datadir=${ROOT}/${MY_DATADIR} \ + --datadir=${EROOT}/${MY_DATADIR} \ --max_allowed_packet=8M \ --net_buffer_length=16K \ --default-storage-engine=MyISAM \ --socket=${socket} \ - --pid-file=${pidfile}" + --pid-file=${pidfile} + --tmpdir=${EROOT}/${MYSQL_TMPDIR}" #einfo "About to start mysqld: ${mysqld}" ebegin "Starting mysqld" einfo "Command ${mysqld}"