From 074b7f24a66f0af8d7da08da025b31b00db8ff20 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Tue, 29 Jan 2013 17:11:27 -0500 Subject: [PATCH] Updated MySQL (cmake) --- config/dependencies | 3 ++ config/packages-list | 4 ++- stage3/hv-install-1 | 6 ++-- stage3/packages-update | 4 +++ stage3/pkg/cmake | 10 +++++++ stage3/pkg/mysql | 67 ++++++++++++++++++++++++++++-------------- 6 files changed, 68 insertions(+), 26 deletions(-) create mode 100644 stage3/pkg/cmake diff --git a/config/dependencies b/config/dependencies index 3cceb7e..4df6cc6 100644 --- a/config/dependencies +++ b/config/dependencies @@ -166,3 +166,6 @@ ${WEBKIT}: ${GPERF} ${GSTREAMER} ${ICU} ${LIBXSLT} ${LIBSOUP} ${MESALIB} \ ${VALA}: ${GLIB} ${MIDORI}: ${WEBKIT} ${VALA} ${LIBNOTIFY} ${LIBRSVG} + +${CMAKE}: ${LIBARCHIVE} +${MYSQL}: ${CMAKE} diff --git a/config/packages-list b/config/packages-list index 2f652f2..4edf987 100644 --- a/config/packages-list +++ b/config/packages-list @@ -42,6 +42,7 @@ CKERMIT="ckermit-8.0.211" CHORDPACK="chordpack-0.8.2" CLAMAV="clamav-0.97.5" CLOOG="cloog-0.16.3" +CMAKE="cmake-2.8.10" COLORDIFF="colordiff-1.0.10" COREUTILS="coreutils-8.16" CPIO="cpio-2.11" @@ -191,6 +192,7 @@ LFS_BOOTSCRIPTS="lfs-bootscripts-20070813" LIBA52="a52dec-0.7.4" LIBART="libart_lgpl-2.3.21" BOOST="boost_1_51_0" +LIBARCHIVE="libarchive-3.0.4" LIBCROCO="libcroco-0.6.6" LIBDVDCSS="libdvdcss-1.2.12" LIBDVDREAD="libdvdread-4.2.0" @@ -259,7 +261,7 @@ MPC="mpc-0.9" MPFR="mpfr-3.1.0" MSMTP="msmtp-1.4.29" MUTT="mutt-1.5.21" -MYSQL="mysql-5.5.27" +MYSQL="mysql-5.5.28" NANO="nano-2.2.6" NASM="nasm-2.10.04" diff --git a/stage3/hv-install-1 b/stage3/hv-install-1 index a23118e..143216c 100755 --- a/stage3/hv-install-1 +++ b/stage3/hv-install-1 @@ -64,9 +64,9 @@ ipkg ${CURL} ipkg ${RSYNC} ipkg -m noac ${GETDATE} -if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then - ipkg ${MYSQL} -fi +ipkg -m acnb ${LIBARCHIVE} "--disable-static" +ipkg -m acnb ${CMAKE} +ipkg -m acnb ${MYSQL} # Archiving ipkg -m noac ${ZIP} diff --git a/stage3/packages-update b/stage3/packages-update index dee5563..27ba1cb 100755 --- a/stage3/packages-update +++ b/stage3/packages-update @@ -50,6 +50,10 @@ fpkg ${IPTABLES} "http://www.netfilter.org/projects/iptables/files" fpkg ${CURL} "http://curl.haxx.se/download" fpkg -e "tar.gz" ${RSYNC} "http://samba.org/ftp/rsync/src" fpkg -m hv ${GETDATE} + +fpkg -e "tar.gz" ${LIBARCHIVE} "http://github.com/downloads/libarchive/libarchive" +fpkg -e "tar.gz" ${CMAKE} "http://www.cmake.org/files/v$(get_pkg_ver2 ${CMAKE})" + fpkg -e "tar.gz" ${MYSQL} \ "http://anduin.linuxfromscratch.org/sources/BLFS/svn/m" fpkg -f "zip$(get_pkg_ver ${ZIP} | sed 's!\.!!g')" -s "infozip" \ diff --git a/stage3/pkg/cmake b/stage3/pkg/cmake new file mode 100644 index 0000000..5a8da49 --- /dev/null +++ b/stage3/pkg/cmake @@ -0,0 +1,10 @@ +#!/bin/bash + +hvconfig() +{ + cd ${LFS_TMP}/${PACKAGE} + + ./bootstrap --prefix=/usr \ + --system-libs \ + --mandir=/share/man +} diff --git a/stage3/pkg/mysql b/stage3/pkg/mysql index 9dbf7ad..e1d59bd 100644 --- a/stage3/pkg/mysql +++ b/stage3/pkg/mysql @@ -4,42 +4,65 @@ hvconfig_pre() { groupadd -f mysql hv_useradd -c mysql -d /dev/null -g mysql -s /bin/false mysql +} + +hvconfig() +{ + cd ${LFS_TMP}/${PACKAGE} + + mkdir build + cd build - CONFIGURE_OPTS="\ - ${CONFIGURE_OPTS} \ - --libexecdir=/usr/sbin \ - --localstatedir=/srv/mysql \ - --enable-thread-safe-client \ - --enable-assembler \ - --enable-local-infile \ - --with-unix-socket-path=/var/run/mysql/mysql.sock \ - --without-debug \ - --without-readline \ - --with-plugins=innobase,myisam \ - --with-extra-charsets=all \ - --with-ssl" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DINSTALL_DOCDIR=share/doc/mysql \ + -DINSTALL_DOCREADMEDIR=share/doc/mysql \ + -DINSTALL_INCLUDEDIR=include/mysql \ + -DINSTALL_INFODIR=share/info \ + -DINSTALL_MANDIR=share/man \ + -DINSTALL_MYSQLDATADIR=/srv/mysql \ + -DINSTALL_MYSQLSHAREDIR=share/mysql \ + -DINSTALL_MYSQLTESTDIR=share/mysql/test \ + -DINSTALL_PLUGINDIR=lib/mysql \ + -DINSTALL_SBINDIR=sbin \ + -DINSTALL_SCRIPTDIR=bin \ + -DINSTALL_SQLBENCHDIR=share/mysql/bench \ + -DINSTALL_SUPPORTFILESDIR=share/mysql/support \ + -DMYSQL_DATADIR=/srv/mysql \ + -DMYSQL_UNIX_ADDR=/var/run/mysql/mysql.sock \ + -DSYSCONFDIR=/etc \ + -DWITH_PARTITION_STORAGE_ENGINE=OFF \ + -DWITH_PERFSCHEMA_STORAGE_ENGINE=OFF \ + -DWITH_READLINE=system \ + -DWITH_SSL=system \ + .. } hvbuild() { make - make benchdir_root=/tmp/mysql-bench install + + SEGMENTS="Client Server IniFiles ManPages SharedLibraries" + SEGMENTS="$SEGMENTS Development Documentation Info Readme" + + for segment in $SEGMENTS; do + cmake -DCMAKE_INSTALL_COMPONENT=$segment -P cmake_install.cmake + done + + unset SEGMENTS } hvbuild_post() { - rm -rf /tmp/mysql - cd /usr/lib - ln -v -sf mysql/libmysqlclient{,_r}.so* . + # Copying default configuration file: + install -v -m644 /usr/share/mysql/support/my-medium.cnf /etc/my.cnf - # Copying default configuration file. - install -v -m644 /usr/share/mysql/my-medium.cnf /etc/my.cnf - sed -i -e s/^skip-federated/#skip-federated/ /etc/my.cnf + # Ensure binary logs are disabled: + sed -i 's/^log-bin/#log-bin/' /etc/my.cnf - mysql_install_db --user=mysql + mysql_install_db --basedir=/usr --datadir=/srv/mysql --user=mysql chgrp mysql /srv/mysql{,/test,/mysql} - install -v -m750 -o mysql -g mysql -d /var/run/mysql + install -v -m755 -o mysql -g mysql -d /var/run/mysql # Further configuration requires that the MySQL server be running # (see cis-postinstall) -- 2.20.1