/[gentoo-x86]/eclass/mysql.eclass
Gentoo

Diff of /eclass/mysql.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.165 Revision 1.175
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2012 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.165 2011/08/29 01:28:10 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.175 2012/09/27 16:35:41 axs Exp $
4 4
5# @ECLASS: mysql.eclass 5# @ECLASS: mysql.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# MySQL Team <mysql-bugs@gentoo.org> 7# MySQL Team <mysql-bugs@gentoo.org>
8# Luca Longinotti <chtekk@gentoo.org> 8# Luca Longinotti <chtekk@gentoo.org>
17# phase hooks. 17# phase hooks.
18 18
19WANT_AUTOCONF="latest" 19WANT_AUTOCONF="latest"
20WANT_AUTOMAKE="latest" 20WANT_AUTOMAKE="latest"
21 21
22inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator toolchain-funcs 22inherit eutils flag-o-matic gnuconfig autotools multilib mysql_fx versionator toolchain-funcs
23 23
24# Shorten the path because the socket path length must be shorter than 107 chars 24# Shorten the path because the socket path length must be shorter than 107 chars
25# and we will run a mysql server during test phase 25# and we will run a mysql server during test phase
26S="${WORKDIR}/mysql" 26S="${WORKDIR}/mysql"
27 27
28[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z" 28[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
29if [[ "${MY_EXTRAS_VER}" == "live" ]]; then 29if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
30 EGIT_PROJECT=mysql-extras 30 EGIT_PROJECT=mysql-extras
31 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" 31 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
32 inherit git 32 inherit git-2
33fi 33fi
34 34
35case "${EAPI:-0}" in 35case "${EAPI:-0}" in
36 2) 36 2|3|4|5)
37 EXPORT_FUNCTIONS pkg_setup \ 37 EXPORT_FUNCTIONS pkg_setup \
38 src_unpack src_prepare \ 38 src_unpack src_prepare \
39 src_configure src_compile \ 39 src_configure src_compile \
40 src_install \ 40 src_install \
41 pkg_preinst pkg_postinst \ 41 pkg_preinst pkg_postinst \
125PERCONA_VER="${PERCONA_VER}" 125PERCONA_VER="${PERCONA_VER}"
126 126
127# Be warned, *DEPEND are version-dependant 127# Be warned, *DEPEND are version-dependant
128# These are used for both runtime and compiletime 128# These are used for both runtime and compiletime
129DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d ) 129DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
130 userland_GNU? ( sys-process/procps ) 130 kernel_linux? ( sys-process/procps )
131 >=sys-apps/sed-4 131 >=sys-apps/sed-4
132 >=sys-apps/texinfo-4.7-r1 132 >=sys-apps/texinfo-4.7-r1
133 >=sys-libs/readline-4.1 133 >=sys-libs/readline-4.1
134 >=sys-libs/zlib-1.2.3" 134 >=sys-libs/zlib-1.2.3"
135 135
140for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do 140for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
141 [[ "${i}" == ${PN} ]] || 141 [[ "${i}" == ${PN} ]] ||
142 DEPEND="${DEPEND} !dev-db/${i}" 142 DEPEND="${DEPEND} !dev-db/${i}"
143done 143done
144 144
145# prefix: first need to implement something for #196294
145RDEPEND="${DEPEND} 146RDEPEND="${DEPEND}
146 !minimal? ( dev-db/mysql-init-scripts ) 147 !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
147 selinux? ( sec-policy/selinux-mysql )" 148 selinux? ( sec-policy/selinux-mysql )"
148 149
149DEPEND="${DEPEND} 150DEPEND="${DEPEND}
150 virtual/yacc" 151 virtual/yacc"
151 152
152if [ "${EAPI:-0}" = "2" ]; then 153if [ "${EAPI:-0}" = "2" ]; then
153 DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )" 154 DEPEND="${DEPEND} static? ( sys-libs/ncurses[static-libs] )"
154fi 155fi
155 156
156# compile-time-only 157# compile-time-only
157mysql_version_is_at_least "5.1" \ 158mysql_version_is_at_least "5.1" \
158|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )" 159|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
361# @DESCRIPTION: 362# @DESCRIPTION:
362# void mysql_init_vars() 363# void mysql_init_vars()
363# Initialize global variables 364# Initialize global variables
364# 2005-11-19 <vivo@gentoo.org> 365# 2005-11-19 <vivo@gentoo.org>
365mysql_init_vars() { 366mysql_init_vars() {
366 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"} 367 MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
367 MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"} 368 MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
368 MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"} 369 MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"}
369 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"} 370 MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
370 MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"} 371 MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
371 MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"} 372 MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
372 373
373 if [[ -z "${MY_DATADIR}" ]] ; then 374 if [[ -z "${MY_DATADIR}" ]] ; then
374 MY_DATADIR="" 375 MY_DATADIR=""
375 if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then 376 if [[ -f ${MY_SYSCONFDIR}/my.cnf ]] ; then
376 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \ 377 MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
377 | sed -ne '/datadir/s|^--datadir=||p' \ 378 | sed -ne '/datadir/s|^--datadir=||p' \
378 | tail -n1` 379 | tail -n1`
379 if [[ -z "${MY_DATADIR}" ]] ; then 380 if [[ -z "${MY_DATADIR}" ]] ; then
380 MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \ 381 MY_DATADIR=`grep ^datadir ${MY_SYSCONFDIR}/my.cnf \
381 | sed -e 's/.*=\s*//' \ 382 | sed -e 's/.*=\s*//' \
382 | tail -n1` 383 | tail -n1`
383 fi 384 fi
384 fi 385 fi
385 if [[ -z "${MY_DATADIR}" ]] ; then 386 if [[ -z "${MY_DATADIR}" ]] ; then
457 myconf="${myconf} $(use_with big-tables)" 458 myconf="${myconf} $(use_with big-tables)"
458 myconf="${myconf} --enable-local-infile" 459 myconf="${myconf} --enable-local-infile"
459 myconf="${myconf} --with-extra-charsets=all" 460 myconf="${myconf} --with-extra-charsets=all"
460 myconf="${myconf} --with-mysqld-user=mysql" 461 myconf="${myconf} --with-mysqld-user=mysql"
461 myconf="${myconf} --with-server" 462 myconf="${myconf} --with-server"
462 myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock" 463 myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
463 myconf="${myconf} --without-libwrap" 464 myconf="${myconf} --without-libwrap"
464 465
465 if use static ; then 466 if use static ; then
466 myconf="${myconf} --with-mysqld-ldflags=-all-static" 467 myconf="${myconf} --with-mysqld-ldflags=-all-static"
467 myconf="${myconf} --with-client-ldflags=-all-static" 468 myconf="${myconf} --with-client-ldflags=-all-static"
502 fi 503 fi
503 504
504} 505}
505 506
506configure_40_41_50() { 507configure_40_41_50() {
508 myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr"
507 myconf="${myconf} $(use_with perl bench)" 509 myconf="${myconf} $(use_with perl bench)"
508 myconf="${myconf} --enable-assembler" 510 myconf="${myconf} --enable-assembler"
509 myconf="${myconf} --with-extra-tools" 511 myconf="${myconf} --with-extra-tools"
510 myconf="${myconf} --with-innodb" 512 myconf="${myconf} --with-innodb"
511 myconf="${myconf} --without-readline" 513 myconf="${myconf} --without-readline"
512 myconf="${myconf} $(use_with ssl openssl)" 514 myconf="${myconf} $(use_with ssl openssl "${EPREFIX}/usr")"
513 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)" 515 mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
514 516
515 # --with-vio is not needed anymore, it's on by default and 517 # --with-vio is not needed anymore, it's on by default and
516 # has been removed from configure 518 # has been removed from configure
517 # Apply to 4.x and 5.0.[0-3] 519 # Apply to 4.x and 5.0.[0-3]
583 585
584configure_51() { 586configure_51() {
585 # TODO: !!!! readd --without-readline 587 # TODO: !!!! readd --without-readline
586 # the failure depend upon config/ac-macros/readline.m4 checking into 588 # the failure depend upon config/ac-macros/readline.m4 checking into
587 # readline.h instead of history.h 589 # readline.h instead of history.h
588 myconf="${myconf} $(use_with ssl ssl /usr)" 590 myconf="${myconf} $(use_with ssl ssl "${EPREFIX}"/usr)"
589 myconf="${myconf} --enable-assembler" 591 myconf="${myconf} --enable-assembler"
590 myconf="${myconf} --with-geometry" 592 myconf="${myconf} --with-geometry"
591 myconf="${myconf} --with-readline" 593 myconf="${myconf} --with-readline"
592 myconf="${myconf} --with-zlib-dir=/usr/" 594 myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr/"
593 myconf="${myconf} --without-pstack" 595 myconf="${myconf} --without-pstack"
594 myconf="${myconf} --with-plugindir=/usr/$(get_libdir)/mysql/plugin" 596 myconf="${myconf} --with-plugindir=${EPREFIX}/usr/$(get_libdir)/mysql/plugin"
595 597
596 # This is an explict die here, because if we just forcibly disable it, then the 598 # This is an explict die here, because if we just forcibly disable it, then the
597 # user's data is not accessible. 599 # user's data is not accessible.
598 use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently" 600 use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
599 #use max-idx-128 && myconf="${myconf} --with-max-indexes=128" 601 #use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
740 742
741 einfo "Reconfiguring dir '${PWD}'" 743 einfo "Reconfiguring dir '${PWD}'"
742 eautoreconf 744 eautoreconf
743 745
744 local myconf="" 746 local myconf=""
745 myconf="${myconf} --with-mysql=${S} --libdir=/usr/$(get_libdir)" 747 myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)"
746 use debug && myconf="${myconf} --with-debug=full" 748 use debug && myconf="${myconf} --with-debug=full"
747 econf ${myconf} || die "Problem configuring PBXT storage engine" 749 econf ${myconf} || die "Problem configuring PBXT storage engine"
748} 750}
749 751
750pbxt_src_compile() { 752pbxt_src_compile() {
786 fi 788 fi
787 789
788 # bug 350844 790 # bug 350844
789 case "${EAPI:-0}" in 791 case "${EAPI:-0}" in
790 0 | 1) 792 0 | 1)
791 if use static && !built_with_use sys-libs/ncurses static-libs; then 793 if use static && ! built_with_use sys-libs/ncurses static-libs; then
792 die "To build MySQL statically you need to enable static-libs for sys-libs/ncurses" 794 die "To build MySQL statically you need to enable static-libs for sys-libs/ncurses"
793 fi 795 fi
794 ;; 796 ;;
795 esac 797 esac
796 798
836 # Bug #290570, 284946, 307251 838 # Bug #290570, 284946, 307251
837 # Upstream changes made us need a fairly new GCC4. 839 # Upstream changes made us need a fairly new GCC4.
838 # But only for 5.0.8[3-6]! 840 # But only for 5.0.8[3-6]!
839 if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then 841 if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then
840 GCC_VER=$(gcc-version) 842 GCC_VER=$(gcc-version)
841 case ${GCC_VER} in 843 case ${CHOST}:${GCC_VER} in
844 *-darwin*:4.*) : ;; # bug #310615
842 2*|3*|4.0|4.1|4.2) 845 *:2*|*:3*|*:4.0|*:4.1|*:4.2)
843 eerror "Some releases of MySQL required a very new GCC, and then" 846 eerror "Some releases of MySQL required a very new GCC, and then"
844 eerror "later release relaxed that requirement again. Either pick a" 847 eerror "later release relaxed that requirement again. Either pick a"
845 eerror "MySQL >=5.0.87, or use a newer GCC." 848 eerror "MySQL >=5.0.87, or use a newer GCC."
846 die "Active GCC too old!" ;; 849 die "Active GCC too old!" ;;
847 esac 850 esac
975 978
976 if mysql_check_version_range "4.1 to 5.0.99.99" \ 979 if mysql_check_version_range "4.1 to 5.0.99.99" \
977 && use berkdb ; then 980 && use berkdb ; then
978 einfo "Fixing up berkdb buildsystem" 981 einfo "Fixing up berkdb buildsystem"
979 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh" 982 [[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
980 cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \ 983 cp -f "${EPREFIX}/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
981 || die "Could not copy libtool.m4 to bdb/dist/" 984 || die "Could not copy libtool.m4 to bdb/dist/"
982 #These files exist only with libtool-2*, and need to be included. 985 #These files exist only with libtool-2*, and need to be included.
983 if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then 986 if [ -f ${EPREFIX}'/usr/share/aclocal/ltsugar.m4' ]; then
984 cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac" 987 cat "${EPREFIX}/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
985 cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac" 988 cat "${EPREFIX}/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
986 cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac" 989 cat "${EPREFIX}/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
987 cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac" 990 cat "${EPREFIX}/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
988 fi 991 fi
989 pushd "bdb/dist" &>/dev/null 992 pushd "bdb/dist" &>/dev/null
990 sh s_all \ 993 sh s_all \
991 || die "Failed bdb reconfigure" 994 || die "Failed bdb reconfigure"
992 popd &>/dev/null 995 popd &>/dev/null
1043 use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \ 1046 use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
1044 append-flags -fno-omit-frame-pointer && \ 1047 append-flags -fno-omit-frame-pointer && \
1045 filter-flags -fomit-frame-pointer 1048 filter-flags -fomit-frame-pointer
1046 1049
1047 econf \ 1050 econf \
1048 --libexecdir="/usr/sbin" \ 1051 --libexecdir="${EPREFIX}"/usr/sbin \
1049 --sysconfdir="${MY_SYSCONFDIR}" \ 1052 --sysconfdir=${MY_SYSCONFDIR} \
1050 --localstatedir="${MY_LOCALSTATEDIR}" \ 1053 --localstatedir=${MY_LOCALSTATEDIR} \
1051 --sharedstatedir="${MY_SHAREDSTATEDIR}" \ 1054 --sharedstatedir=${MY_SHAREDSTATEDIR} \
1052 --libdir="${MY_LIBDIR}" \ 1055 --libdir=${MY_LIBDIR} \
1053 --includedir="${MY_INCLUDEDIR}" \ 1056 --includedir=${MY_INCLUDEDIR} \
1054 --with-low-memory \ 1057 --with-low-memory \
1055 --with-client-ldflags=-lstdc++ \ 1058 --with-client-ldflags=-lstdc++ \
1056 --enable-thread-safe-client \ 1059 --enable-thread-safe-client \
1057 --with-comment="Gentoo Linux ${PF}" \ 1060 --with-comment="Gentoo Linux ${PF}" \
1058 --without-docs \ 1061 --without-docs \
1093 # Make sure the vars are correctly initialized 1096 # Make sure the vars are correctly initialized
1094 mysql_init_vars 1097 mysql_init_vars
1095 1098
1096 emake install \ 1099 emake install \
1097 DESTDIR="${D}" \ 1100 DESTDIR="${D}" \
1098 benchdir_root="${MY_SHAREDSTATEDIR}" \ 1101 benchdir_root=${MY_SHAREDSTATEDIR} \
1099 testroot="${MY_SHAREDSTATEDIR}" \ 1102 testroot="${MY_SHAREDSTATEDIR}" \
1100 || die "emake install failed" 1103 || die "emake install failed"
1101 1104
1102 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then 1105 if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
1103 pbxt_patch_available && use pbxt && pbxt_src_install 1106 pbxt_patch_available && use pbxt && pbxt_src_install
1109 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair" 1112 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
1110 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize" 1113 dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
1111 1114
1112 # Various junk (my-*.cnf moved elsewhere) 1115 # Various junk (my-*.cnf moved elsewhere)
1113 einfo "Removing duplicate /usr/share/mysql files" 1116 einfo "Removing duplicate /usr/share/mysql files"
1114 rm -Rf "${D}/usr/share/info" 1117 rm -Rf "${ED}/usr/share/info"
1115 for removeme in "mysql-log-rotate" mysql.server* \ 1118 for removeme in "mysql-log-rotate" mysql.server* \
1116 binary-configure* my-*.cnf mi_test_all* 1119 binary-configure* my-*.cnf mi_test_all*
1117 do 1120 do
1118 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme} 1121 rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
1119 done 1122 done
1120 1123
1121 # Clean up stuff for a minimal build 1124 # Clean up stuff for a minimal build
1122 if use minimal ; then 1125 if use minimal ; then
1123 einfo "Remove all extra content for minimal build" 1126 einfo "Remove all extra content for minimal build"
1124 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench} 1127 rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
1125 rm -f "${D}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam} 1128 rm -f "${ED}"/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
1126 rm -f "${D}/usr/sbin/mysqld" 1129 rm -f "${ED}/usr/sbin/mysqld"
1127 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a 1130 rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
1128 fi 1131 fi
1129 1132
1130 # Unless they explicitly specific USE=test, then do not install the 1133 # Unless they explicitly specific USE=test, then do not install the
1131 # testsuite. It DOES have a use to be installed, esp. when you want to do a 1134 # testsuite. It DOES have a use to be installed, esp. when you want to do a
1139 3*|4.0) mysql_mycnf_version="4.0" ;; 1142 3*|4.0) mysql_mycnf_version="4.0" ;;
1140 4.[1-9]|5.0) mysql_mycnf_version="4.1" ;; 1143 4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
1141 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;; 1144 5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
1142 esac 1145 esac
1143 einfo "Building default my.cnf (${mysql_mycnf_version})" 1146 einfo "Building default my.cnf (${mysql_mycnf_version})"
1144 insinto "${MY_SYSCONFDIR}" 1147 insinto "${MY_SYSCONFDIR#${EPREFIX}}"
1145 doins scripts/mysqlaccess.conf 1148 doins scripts/mysqlaccess.conf
1146 mycnf_src="my.cnf-${mysql_mycnf_version}" 1149 mycnf_src="my.cnf-${mysql_mycnf_version}"
1147 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ 1150 sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
1151 -e "s!/tmp!${EPREFIX}/tmp!" \
1152 -e "s!/usr!${EPREFIX}/usr!" \
1153 -e "s!= /var!= ${EPREFIX}/var!" \
1148 "${FILESDIR}/${mycnf_src}" \ 1154 "${FILESDIR}/${mycnf_src}" \
1149 > "${TMPDIR}/my.cnf.ok" 1155 > "${TMPDIR}/my.cnf.ok"
1156 use prefix && sed -i -e '/^user[ ]*= mysql$/d' "${TMPDIR}/my.cnf.ok"
1150 if use latin1 ; then 1157 if use latin1 ; then
1151 sed -i \ 1158 sed -i \
1152 -e "/character-set/s|utf8|latin1|g" \ 1159 -e "/character-set/s|utf8|latin1|g" \
1153 "${TMPDIR}/my.cnf.ok" 1160 "${TMPDIR}/my.cnf.ok"
1154 fi 1161 fi
1158 if ! use minimal ; then 1165 if ! use minimal ; then
1159 einfo "Creating initial directories" 1166 einfo "Creating initial directories"
1160 # Empty directories ... 1167 # Empty directories ...
1161 diropts "-m0750" 1168 diropts "-m0750"
1162 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then 1169 if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
1163 dodir "${MY_DATADIR}" 1170 dodir "${MY_DATADIR#${EPREFIX}}"
1164 keepdir "${MY_DATADIR}" 1171 keepdir "${MY_DATADIR#${EPREFIX}}"
1165 chown -R mysql:mysql "${D}/${MY_DATADIR}" 1172 chown -R mysql:mysql "${D}/${MY_DATADIR}"
1166 fi 1173 fi
1167 1174
1168 diropts "-m0755" 1175 diropts "-m0755"
1169 for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do 1176 for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
1170 dodir "${folder}" 1177 dodir "${folder}"
1171 keepdir "${folder}" 1178 keepdir "${folder}"
1172 chown -R mysql:mysql "${D}/${folder}" 1179 chown -R mysql:mysql "${ED}/${folder}"
1173 done 1180 done
1174 fi 1181 fi
1175 1182
1176 # Docs 1183 # Docs
1177 einfo "Installing docs" 1184 einfo "Installing docs"
1197 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}" 1204 [[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
1198 done 1205 done
1199 1206
1200 fi 1207 fi
1201 1208
1202 mysql_lib_symlinks "${D}" 1209 mysql_lib_symlinks "${ED}"
1203} 1210}
1204 1211
1205# @FUNCTION: mysql_pkg_preinst 1212# @FUNCTION: mysql_pkg_preinst
1206# @DESCRIPTION: 1213# @DESCRIPTION:
1207# Create the user and groups for mysql - die if that fails. 1214# Create the user and groups for mysql - die if that fails.
1221mysql_pkg_postinst() { 1228mysql_pkg_postinst() {
1222 # Make sure the vars are correctly initialized 1229 # Make sure the vars are correctly initialized
1223 mysql_init_vars 1230 mysql_init_vars
1224 1231
1225 # Check FEATURES="collision-protect" before removing this 1232 # Check FEATURES="collision-protect" before removing this
1226 [[ -d "${ROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}" 1233 [[ -d "${EROOT}/var/log/mysql" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
1227 1234
1228 # Secure the logfiles 1235 # Secure the logfiles
1229 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err} 1236 touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
1230 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql* 1237 chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
1231 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql* 1238 chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
1295 if built_with_use ${CATEGORY}/${PN} minimal ; then 1302 if built_with_use ${CATEGORY}/${PN} minimal ; then
1296 die "Minimal builds do NOT include the MySQL server" 1303 die "Minimal builds do NOT include the MySQL server"
1297 fi 1304 fi
1298 1305
1299 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then 1306 if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
1300 local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})" 1307 local MY_DATADIR_s="${ROOT}/${MY_DATADIR}"
1308 MY_DATADIR_s="${MY_DATADIR_s%%/}"
1301 local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})" 1309 local old_MY_DATADIR_s="${ROOT}/${old_MY_DATADIR}"
1310 old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
1302 1311
1303 if [[ -d "${old_MY_DATADIR_s}" ]]; then 1312 if [[ -d "${old_MY_DATADIR_s}" ]]; then
1304 if [[ -d "${MY_DATADIR_s}" ]]; then 1313 if [[ -d "${MY_DATADIR_s}" ]]; then
1305 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist" 1314 ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
1306 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}" 1315 ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
1322 1331
1323 local pwd1="a" 1332 local pwd1="a"
1324 local pwd2="b" 1333 local pwd2="b"
1325 local maxtry=15 1334 local maxtry=15
1326 1335
1327 if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${ROOT}/root/.my.cnf" ]; then 1336 if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${EROOT}/root/.my.cnf" ]; then
1328 MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${ROOT}/root/.my.cnf")" 1337 MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${EROOT}/root/.my.cnf")"
1329 fi 1338 fi
1330 1339
1331 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then 1340 if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
1332 ewarn "You have already a MySQL database in place." 1341 ewarn "You have already a MySQL database in place."
1333 ewarn "(${ROOT}/${MY_DATADIR}/*)" 1342 ewarn "(${ROOT}/${MY_DATADIR}/*)"
1364 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \ 1373 && cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
1365 || touch "${TMPDIR}/fill_help_tables.sql" 1374 || touch "${TMPDIR}/fill_help_tables.sql"
1366 help_tables="${TMPDIR}/fill_help_tables.sql" 1375 help_tables="${TMPDIR}/fill_help_tables.sql"
1367 1376
1368 pushd "${TMPDIR}" &>/dev/null 1377 pushd "${TMPDIR}" &>/dev/null
1369 "${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1 1378 "${EROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
1370 if [ $? -ne 0 ]; then 1379 if [ $? -ne 0 ]; then
1371 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2 1380 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
1372 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log" 1381 die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
1373 fi 1382 fi
1374 popd &>/dev/null 1383 popd &>/dev/null
1377 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null 1386 chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
1378 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null 1387 chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
1379 1388
1380 # Figure out which options we need to disable to do the setup 1389 # Figure out which options we need to disable to do the setup
1381 helpfile="${TMPDIR}/mysqld-help" 1390 helpfile="${TMPDIR}/mysqld-help"
1382 ${ROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null 1391 ${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
1383 for opt in grant-tables host-cache name-resolve networking slave-start bdb \ 1392 for opt in grant-tables host-cache name-resolve networking slave-start bdb \
1384 federated innodb ssl log-bin relay-log slow-query-log external-locking \ 1393 federated innodb ssl log-bin relay-log slow-query-log external-locking \
1385 ndbcluster \ 1394 ndbcluster \
1386 ; do 1395 ; do
1387 optexp="--(skip-)?${opt}" optfull="--skip-${opt}" 1396 optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
1392 options="${options/skip-locking/skip-external-locking}" 1401 options="${options/skip-locking/skip-external-locking}"
1393 1402
1394 if mysql_version_is_at_least "4.1.3" ; then 1403 if mysql_version_is_at_least "4.1.3" ; then
1395 # Filling timezones, see 1404 # Filling timezones, see
1396 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html 1405 # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
1397 "${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null 1406 "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
1398 1407
1399 if [[ -r "${help_tables}" ]] ; then 1408 if [[ -r "${help_tables}" ]] ; then
1400 cat "${help_tables}" >> "${sqltmp}" 1409 cat "${help_tables}" >> "${sqltmp}"
1401 fi 1410 fi
1402 fi 1411 fi
1403 1412
1404 einfo "Creating the mysql database and setting proper" 1413 einfo "Creating the mysql database and setting proper"
1405 einfo "permissions on it ..." 1414 einfo "permissions on it ..."
1406 1415
1416 use prefix || options="${options} --user=mysql"
1417
1407 local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock" 1418 local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
1408 local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid" 1419 local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
1409 local mysqld="${ROOT}/usr/sbin/mysqld \ 1420 local mysqld="${EROOT}/usr/sbin/mysqld \
1410 ${options} \ 1421 ${options} \
1411 --user=mysql \ 1422 --user=mysql \
1412 --basedir=${ROOT}/usr \ 1423 --basedir=${EROOT}/usr \
1413 --datadir=${ROOT}/${MY_DATADIR} \ 1424 --datadir=${ROOT}/${MY_DATADIR} \
1414 --max_allowed_packet=8M \ 1425 --max_allowed_packet=8M \
1415 --net_buffer_length=16K \ 1426 --net_buffer_length=16K \
1416 --default-storage-engine=MyISAM \ 1427 --default-storage-engine=MyISAM \
1417 --socket=${socket} \ 1428 --socket=${socket} \
1432 fi 1443 fi
1433 1444
1434 ebegin "Setting root password" 1445 ebegin "Setting root password"
1435 # Do this from memory, as we don't want clear text passwords in temp files 1446 # Do this from memory, as we don't want clear text passwords in temp files
1436 local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'" 1447 local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
1437 "${ROOT}/usr/bin/mysql" \ 1448 "${EROOT}/usr/bin/mysql" \
1438 --socket=${socket} \ 1449 --socket=${socket} \
1439 -hlocalhost \ 1450 -hlocalhost \
1440 -e "${sql}" 1451 -e "${sql}"
1441 eend $? 1452 eend $?
1442 1453
1443 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..." 1454 ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
1444 "${ROOT}/usr/bin/mysql" \ 1455 "${EROOT}/usr/bin/mysql" \
1445 --socket=${socket} \ 1456 --socket=${socket} \
1446 -hlocalhost \ 1457 -hlocalhost \
1447 -uroot \ 1458 -uroot \
1448 -p"${MYSQL_ROOT_PASSWORD}" \ 1459 -p"${MYSQL_ROOT_PASSWORD}" \
1449 mysql < "${sqltmp}" 1460 mysql < "${sqltmp}"
1461 1472
1462# @FUNCTION: mysql_pkg_postrm 1473# @FUNCTION: mysql_pkg_postrm
1463# @DESCRIPTION: 1474# @DESCRIPTION:
1464# Remove mysql symlinks. 1475# Remove mysql symlinks.
1465mysql_pkg_postrm() { 1476mysql_pkg_postrm() {
1466 : # mysql_lib_symlinks "${D}" 1477 : # mysql_lib_symlinks "${ED}"
1467} 1478}

Legend:
Removed from v.1.165  
changed lines
  Added in v.1.175

  ViewVC Help
Powered by ViewVC 1.1.20