summaryrefslogtreecommitdiffstats
path: root/extra/mysql
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2011-07-30 00:47:36 +0200
committerpiernov <piernov@piernov.org>2011-07-30 00:47:36 +0200
commit6ae8ee060ce255edf3a237ab399e6dfb15f6094d (patch)
tree66dc1f1030bca434e8e6f0e44d49a6ae906ef185 /extra/mysql
parentf0730aa53f6e893b2261f0505600564d0ebc7ce7 (diff)
downloadnutyx-pakxe-6ae8ee060ce255edf3a237ab399e6dfb15f6094d.tar.gz
nutyx-pakxe-6ae8ee060ce255edf3a237ab399e6dfb15f6094d.tar.bz2
nutyx-pakxe-6ae8ee060ce255edf3a237ab399e6dfb15f6094d.tar.xz
nutyx-pakxe-6ae8ee060ce255edf3a237ab399e6dfb15f6094d.zip
mysql 5.5.15-1 màj port
Diffstat (limited to 'extra/mysql')
-rw-r--r--extra/mysql/.md5sum.i6863
-rw-r--r--extra/mysql/.md5sum.x86_643
-rw-r--r--extra/mysql/Pkgfile152
-rw-r--r--extra/mysql/README1
-rwxr-xr-xextra/mysql/post-install4
5 files changed, 63 insertions, 100 deletions
diff --git a/extra/mysql/.md5sum.i686 b/extra/mysql/.md5sum.i686
index 7456d6e8f..eea03fbfd 100644
--- a/extra/mysql/.md5sum.i686
+++ b/extra/mysql/.md5sum.i686
@@ -1 +1,2 @@
-19f43bb9c72b1b5f7ff86a7f921c9244 mysql-5.5.14.tar.gz
+ba1da37e819a39914feffd874fff50af blfs-bootscripts-20100825.tar.bz2
+306b5549c7bd72e8e705a890db0da82b mysql-5.5.15.tar.gz
diff --git a/extra/mysql/.md5sum.x86_64 b/extra/mysql/.md5sum.x86_64
index 7456d6e8f..eea03fbfd 100644
--- a/extra/mysql/.md5sum.x86_64
+++ b/extra/mysql/.md5sum.x86_64
@@ -1 +1,2 @@
-19f43bb9c72b1b5f7ff86a7f921c9244 mysql-5.5.14.tar.gz
+ba1da37e819a39914feffd874fff50af blfs-bootscripts-20100825.tar.bz2
+306b5549c7bd72e8e705a890db0da82b mysql-5.5.15.tar.gz
diff --git a/extra/mysql/Pkgfile b/extra/mysql/Pkgfile
index 3e4e1460d..f1d940096 100644
--- a/extra/mysql/Pkgfile
+++ b/extra/mysql/Pkgfile
@@ -4,119 +4,79 @@
# Packager: thierryn1 at hispeed dot ch
# Depends on: cmake, mysqlclient
# Run on: mysqlclient
+source /etc/blfs-bootscripts
name=mysql
-version=5.5.14
+version=5.5.15
release=1
-source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-${version%.*}/$name-$version.tar.gz)
+source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-${version%.*}/$name-$version.tar.gz
+ http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2)
build () {
- source /etc/blfs-bootscripts
- wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
- tar xvf $scripts-$scriptsversion.tar.bz2
+ cd $SRC
+ mkdir build
+ cd build
- cd $SRC
- mkdir build
- cd build
+ CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer"
+ CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti"
- CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer"
- CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti"
-
- cmake ../mysql-$version \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMYSQL_DATADIR=/srv/mysql \
- -DSYSCONFDIR=/etc/mysql \
- -DINSTALL_INFODIR=share/mysql/docs \
- -DINSTALL_MANDIR=share/man \
- -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
- -DINSTALL_SCRIPTDIR=bin \
- -DINSTALL_INCLUDEDIR=include/mysql \
- -DINSTALL_DOCREADMEDIR=share/mysql \
- -DINSTALL_SUPPORTFILESDIR=share/mysql \
- -DINSTALL_MYSQLSHAREDIR=share/mysql \
- -DINSTALL_SHAREDIR=share/mysql \
- -DWITH_READLINE=ON \
- -DWITH_ZLIB=system \
- -DWITH_SSL=system \
- -DWITH_LIBWRAP=ON \
- -DDEFAULT_CHARSET=utf8 \
- -DDEFAULT_COLLATION=utf8_general_ci \
- -DWITH_EXTRA_CHARSETS=complex \
- -DWITH_EMBEDDED_SERVER=ON \
- -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
- -DENABLED_LOCAL_INFILE=ON \
- -DWITH_PARTITION_STORAGE_ENGINE=1 \
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
- -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
- -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
- -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
- -DWITH_INNOBASE_STORAGE_ENGINE=1
+ cmake ../mysql-$version \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONFDIR=/etc/mysql \
+ -DMYSQL_DATADIR=/srv/mysql \
+ -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+ -DINSTALL_INFODIR=share/mysql/docs \
+ -DINSTALL_MANDIR=share/man \
+ -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
+ -DINSTALL_SCRIPTDIR=bin \
+ -DINSTALL_INCLUDEDIR=include/mysql \
+ -DINSTALL_DOCREADMEDIR=share/mysql \
+ -DINSTALL_SUPPORTFILESDIR=share/mysql \
+ -DINSTALL_MYSQLSHAREDIR=share/mysql \
+ -DINSTALL_SHAREDIR=share/mysql \
+ -DDEFAULT_CHARSET=utf8 \
+ -DDEFAULT_COLLATION=utf8_general_ci \
+ -DENABLED_LOCAL_INFILE=ON \
+ -DWITH_READLINE=ON \
+ -DWITH_ZLIB=system \
+ -DWITH_SSL=system \
+ -DWITH_LIBWRAP=ON \
+ -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
+ -DWITH_EXTRA_CHARSETS=complex \
+ -DWITH_EMBEDDED_SERVER=ON \
+ -DWITH_INNOBASE_STORAGE_ENGINE=1 \
+ -DWITH_PARTITION_STORAGE_ENGINE=1 \
+ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+ -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
+ -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
+ -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
make
cd $SRC/build
- make DESTDIR=$PKG install
-
-# install -Dm644 $SRC/my.cnf $PKG/etc/mysql/my.cnf
-# install -Dm755 $SRC/mysqld $PKG/etc/rc.d/mysqld
+ make DESTDIR=$PKG install
- # provided by libmysqlclient
- rm $PKG/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
- rm $PKG/usr/lib/libmysql*
- rm -r $PKG/usr/include/
- rm $PKG/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
-
- # provided by mysql-clients
- rm $PKG/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
- rm $PKG/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+ # Fournit par libmysql
+ rm $PKG/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+ rm $PKG/usr/lib/libmysql*
+ rm -r $PKG/usr/include/
+ rm $PKG/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
- # not needed
- rm -r $PKG/usr/{mysql-test,sql-bench}
+ # Fournit par mysqlclient
+ rm $PKG/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+ rm $PKG/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
- # These shouldn't be here
- rm -r $PKG/usr/docs
- install -d $PKG/srv/mysql
- cp -r $PKG/usr/data/* $PKG/srv/mysql/
- chmod -R 700 $PKG/srv/mysql
+ # These shouldn't be here
+ rm -r $PKG/usr/docs
+ install -d $PKG/srv/mysql
+ cp -r $PKG/usr/data/* $PKG/srv/mysql/
+ chmod -R 700 $PKG/srv/mysql
-# cd $name-$version
-# libtoolize --force
-# aclocal
-# autoconf
-# automake
-# ./configure --prefix=/usr \
-# --sysconfdir=/etc \
-# --libexecdir=/usr/sbin \
-# --localstatedir=/srv/mysql \
-# --enable-assembler \
-# --enable-thread-safe-client \
-# --enable-local-infile \
-# --with-unix-socket-path=/var/run/mysql/mysql.sock \
-# --with-extra-charsets=all \
-# --with-plugins=partition,innobase,innodb_plugin \
-# --without-debug \
-# --without-readline \
-# --without-docs \
-# --without-bench
-# make
-# make DESTDIR=$PKG install
-# rm -r $PKG/usr/{mysql-test,sql-bench}
-# for i in mysql mysql_upgrade \
-# mysqladmin mysqlbinlog \
-# mysqlcheck mysqldump mysqlimport mysqlshow \
-# mysqlslap mysqltest mysql_config
-# do rm -r $PKG/usr/bin/$i
-# done
-# rm $PKG/usr/share/mysql/charsets/README
mkdir -p $PKG/etc
- install -v -m644 $PKG/usr/share/mysql/my-medium.cnf \
- $PKG/etc/my.cnf
- sed -i -e s/^skip-federated/#skip-federated/ \
- $PKG/etc/my.cnf
+ install -v -m644 $PKG/usr/share/mysql/my-medium.cnf $PKG/etc/my.cnf
+ sed -i -e s/^skip-federated/#skip-federated/ $PKG/etc/my.cnf
cd ../$scripts-$scriptsversion
make DESTDIR=$PKG install-mysql
-# # Suppression des librairies
-# rm -r $PKG/usr/{include,lib}
}
diff --git a/extra/mysql/README b/extra/mysql/README
index 6edc2b149..ace3afb94 100644
--- a/extra/mysql/README
+++ b/extra/mysql/README
@@ -29,4 +29,3 @@ Aucune erreur ne doit apparaître.
Au prochain lancement de la machine, mysql se lancera correctement.
pour plus d'info: http://www.nutyx.org
-
diff --git a/extra/mysql/post-install b/extra/mysql/post-install
index 0815530c8..5cef9dfec 100755
--- a/extra/mysql/post-install
+++ b/extra/mysql/post-install
@@ -1,6 +1,8 @@
#!/bin/sh
-
+/etc/rc.d/init.d/mysql stop
mysql_install_db --basedir=/usr --datadir=/srv/mysql --user=mysql
chgrp mysql /srv/mysql{,/test,/mysql}
install -m755 -o mysql -g mysql -d /var/run/mysql
+/etc/rc.d/init.d/mysql start
+mysql_upgrade -p