From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q0549-0004X2-Cb for garchives@archives.gentoo.org; Thu, 17 Mar 2011 04:44:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 33E221C043; Thu, 17 Mar 2011 04:43:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E6B901C043 for ; Thu, 17 Mar 2011 04:43:56 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 68CDC1B4004 for ; Thu, 17 Mar 2011 04:43:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CAC318006A for ; Thu, 17 Mar 2011 04:43:55 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <23d882d9665185c9708c033fafcf4c8a78ed95af.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mysql/, eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: dev-db/mysql/Manifest eclass/mysql-cmake.eclass eclass/mysql_fx.eclass X-VCS-Directories: dev-db/mysql/ eclass/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: 23d882d9665185c9708c033fafcf4c8a78ed95af Date: Thu, 17 Mar 2011 04:43:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: e7e0094d9ba20ebb3a96ce9b7157f6ff commit: 23d882d9665185c9708c033fafcf4c8a78ed95af Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Thu Mar 17 04:42:10 2011 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Thu Mar 17 04:42:10 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3D23d882d9 Really add the mysql_fx.eclass update. Restore the create data dir block in src_install. --- dev-db/mysql/Manifest | 2 +- eclass/mysql-cmake.eclass | 32 ++++++++++---------- eclass/mysql_fx.eclass | 73 +++++++++++++++++++++++++++++++++++++++= ++++- 3 files changed, 88 insertions(+), 19 deletions(-) diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index bca7e10..be972aa 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -23,7 +23,7 @@ EBUILD mysql-5.1.51-r1.ebuild 8599 RMD160 d1a1ee50ba911= 35ceefd5d864c674f94abf804 EBUILD mysql-5.1.51.ebuild 8535 RMD160 5ba70e7adcd64e12e82eb535626c62e0b= fd037d9 SHA1 ff6b3977d1ef7d5478e252a2674f9f9908152fc6 SHA256 ec064ac9c531= c81debdebdba0d82e5d9e60658313fd384afc411a11f54bb603b EBUILD mysql-5.1.52-r2.ebuild 8599 RMD160 d1a1ee50ba91135ceefd5d864c674f= 94abf80441 SHA1 4cf3312866227c0943326d42f17d2c010a71ea92 SHA256 f12785c65= 871d19a3988283f3a03b8b1b6562e7564d42eeb8c6f213d88205a5d EBUILD mysql-5.1.53-r1.ebuild 8605 RMD160 48dc76fceda6b3d78c2eeb615e5b98= 8cb8fb8dd4 SHA1 11546673524f53b852ecd89c768c628c2a7f2c97 SHA256 9cec68559= 741bf8c40252aae7366f637da863b91f19f21454f07e58f11c48c82 -EBUILD mysql-5.5.10.ebuild 6907 RMD160 3cd815a40143d33e9a939c8d0937d0da5= 50a6f9e SHA1 8ae70da5b59b6ed898fe6a50924d1db08542902e SHA256 24d9f7a4de93= 9177eee9f334c086ba2144c897cb508f93256b6ffee650456be9 +EBUILD mysql-5.5.10.ebuild 6866 RMD160 bfc0e6b14720be2cf70e6291c6e12600f= ac8dd3a SHA1 06d16abd5266064f67ad745c2263bf90b57715ec SHA256 0bf345406c9a= da42dcbb94d94bac566e1b11d11d048dae34d08291687da570f7 EBUILD mysql-5.5.4_alpha_pre3.ebuild 6903 RMD160 dd85e75069e59ae77f5fccd= d9fff994aaeb06899 SHA1 8a0f91a49b63681f428beb589512924d347cc643 SHA256 25= cf50e56a99318309cd9f51d86695018d957dec53e7ef5eda7e9d2a3233d086 MISC ChangeLog 4146 RMD160 4a3dcf64319e002e55d39ed08be555175e1c3302 SHA1= 063643af9d2fb5b35377b62a29a5bee7e7ac4fd6 SHA256 45e640d6ae2af796f589c66e= 0d7841c840c66be06fa7373b36721dbe12374cfe MISC metadata.xml 1216 RMD160 02f8b2bd126a9336cddb83f3f9e811d4129688cc S= HA1 5adf0187c051f9e9f79e3148cf0a074f5230060d SHA256 1eff466af9a3c635bfe48= 0c6c6fd37c8cc87251285f0a5b3f2b7661a18ee5574 diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index d2ef3cc..7063e17 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -389,23 +389,23 @@ mysql-cmake_src_install() { newins "${TMPDIR}/my.cnf.ok" my.cnf =20 # Minimal builds don't have the MySQL server -# if ! use minimal ; then -# einfo "Creating initial directories" + if ! use minimal ; then + einfo "Creating initial directories" # Empty directories ... -# diropts "-m0750" -# if [[ "${PREVIOUS_DATADIR}" !=3D "yes" ]] ; then -# dodir "${MY_DATADIR}" -# keepdir "${MY_DATADIR}" -# chown -R mysql:mysql "${D}/${MY_DATADIR}" -# fi -# -# diropts "-m0755" -# for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do -# dodir "${folder}" -# keepdir "${folder}" -# chown -R mysql:mysql "${D}/${folder}" -# done -# fi + diropts "-m0750" + if [[ "${PREVIOUS_DATADIR}" !=3D "yes" ]] ; then + dodir "${MY_DATADIR}" + keepdir "${MY_DATADIR}" + chown -R mysql:mysql "${D}/${MY_DATADIR}" + fi + + diropts "-m0755" + for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do + dodir "${folder}" + keepdir "${folder}" + chown -R mysql:mysql "${D}/${folder}" + done + fi =20 # Docs # einfo "Installing docs" diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass index cb369be..25b7da4 100644 --- a/eclass/mysql_fx.eclass +++ b/eclass/mysql_fx.eclass @@ -3,8 +3,9 @@ # $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.22 2009/02= /12 05:05:14 robbat2 Exp $ =20 # Author: Francesco Riosa (Retired) -# Maintainer: MySQL Team -# Luca Longinotti +# Maintainer: +# - MySQL Team +# - Luca Longinotti =20 inherit multilib =20 @@ -211,3 +212,71 @@ mysql_lib_symlinks() { done popd &> /dev/null } + +# @FUNCTION: mysql_init_vars +# @DESCRIPTION: +# void mysql_init_vars() +# Initialize global variables +# 2005-11-19 +mysql_init_vars() { + MY_SHAREDSTATEDIR=3D${MY_SHAREDSTATEDIR=3D"/usr/share/mysql"} + MY_SYSCONFDIR=3D${MY_SYSCONFDIR=3D"/etc/mysql"} + MY_LIBDIR=3D${MY_LIBDIR=3D"/usr/$(get_libdir)/mysql"} + MY_LOCALSTATEDIR=3D${MY_LOCALSTATEDIR=3D"/var/lib/mysql"} + MY_LOGDIR=3D${MY_LOGDIR=3D"/var/log/mysql"} + MY_INCLUDEDIR=3D${MY_INCLUDEDIR=3D"/usr/include/mysql"} + + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR=3D"" + if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then + MY_DATADIR=3D`"my_print_defaults" mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=3D||p' \ + | tail -n1` + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR=3D`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ + | sed -e 's/.*=3D\s*//' \ + | tail -n1` + fi + fi + if [[ -z "${MY_DATADIR}" ]] ; then + MY_DATADIR=3D"${MY_LOCALSTATEDIR}" + einfo "Using default MY_DATADIR" + fi + elog "MySQL MY_DATADIR is ${MY_DATADIR}" + + if [[ -z "${PREVIOUS_DATADIR}" ]] ; then + if [[ -e "${MY_DATADIR}" ]] ; then + # If you get this and you're wondering about it, see bug #207636 + elog "MySQL datadir found in ${MY_DATADIR}" + elog "A new one will not be created." + PREVIOUS_DATADIR=3D"yes" + else + PREVIOUS_DATADIR=3D"no" + fi + export PREVIOUS_DATADIR + fi + else + if [[ ${EBUILD_PHASE} =3D=3D "config" ]]; then + local new_MY_DATADIR + new_MY_DATADIR=3D`"my_print_defaults" mysqld 2>/dev/null \ + | sed -ne '/datadir/s|^--datadir=3D||p' \ + | tail -n1` + + if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" !=3D "${MY_= DATADIR}" ) ]]; then + ewarn "MySQL MY_DATADIR has changed" + ewarn "from ${MY_DATADIR}" + ewarn "to ${new_MY_DATADIR}" + MY_DATADIR=3D"${new_MY_DATADIR}" + fi + fi + fi + + if [ "${MY_SOURCEDIR:-unset}" =3D=3D "unset" ]; then + MY_SOURCEDIR=3D${SERVER_URI##*/} + MY_SOURCEDIR=3D${MY_SOURCEDIR%.tar*} + fi + + export MY_SHAREDSTATEDIR MY_SYSCONFDIR + export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR + export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR +}