From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F1DC31381FA for ; Mon, 19 May 2014 17:02:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 447E7E0AE8; Mon, 19 May 2014 17:02:53 +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 C1674E0AE8 for ; Mon, 19 May 2014 17:02:52 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A796233F8F2 for ; Mon, 19 May 2014 17:02:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 4853D1818D for ; Mon, 19 May 2014 17:02:49 +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: <1400518914.623f3c3838de2dddf7c5949f4e5ec47bd5a083b5.grknight.pub@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-multilib.eclass eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 623f3c3838de2dddf7c5949f4e5ec47bd5a083b5 X-VCS-Branch: master Date: Mon, 19 May 2014 17:02:49 +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: 351faf17-2310-49e5-bce7-0e6b5c8a00c9 X-Archives-Hash: 31ba03e265f2e2d34aaa58a35bcef109 commit: 623f3c3838de2dddf7c5949f4e5ec47bd5a083b5 Author: Brian Evans gentoo org> AuthorDate: Mon May 19 16:23:57 2014 +0000 Commit: Brian Evans lavabit 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}"