diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mysql/.footprint.i686 | 13 | ||||
| -rw-r--r-- | extra/mysql/.footprint.x86_64 | 13 | ||||
| -rw-r--r-- | extra/mysql/.md5sum.i686 | 2 | ||||
| -rw-r--r-- | extra/mysql/.md5sum.x86_64 | 2 | ||||
| -rw-r--r-- | extra/mysql/Pkgfile | 13 | ||||
| -rwxr-xr-x | extra/mysql/post-install | 2 |
6 files changed, 21 insertions, 24 deletions
diff --git a/extra/mysql/.footprint.i686 b/extra/mysql/.footprint.i686 index 3c547ea72..ac628b559 100644 --- a/extra/mysql/.footprint.i686 +++ b/extra/mysql/.footprint.i686 @@ -19,6 +19,12 @@ drwxr-xr-x root/root etc/rc.d/rc6.d/ lrwxrwxrwx root/root etc/rc.d/rc6.d/K26mysql -> ../init.d/mysql drwxr-xr-x root/root etc/rc.d/rcsysinit.d/ drwxr-xr-x root/root etc/sysconfig/ +drwxr-xr-x root/root srv/ +drwx------ root/root srv/mysql/ +drwx------ root/root srv/mysql/mysql/ +-rwx------ root/root srv/mysql/mysql/.empty (EMPTY) +drwx------ root/root srv/mysql/test/ +-rwx------ root/root srv/mysql/test/.empty (EMPTY) drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/innochecksum @@ -213,10 +219,3 @@ drwxr-xr-x root/root usr/share/mysql/swedish/ -rw-r--r-- root/root usr/share/mysql/swedish/errmsg.sys drwxr-xr-x root/root usr/share/mysql/ukrainian/ -rw-r--r-- root/root usr/share/mysql/ukrainian/errmsg.sys -drwxr-xr-x root/root var/ -drwxr-xr-x root/root var/lib/ -drwx------ root/root var/lib/mysql/ -drwx------ root/root var/lib/mysql/mysql/ --rwx------ root/root var/lib/mysql/mysql/.empty (EMPTY) -drwx------ root/root var/lib/mysql/test/ --rwx------ root/root var/lib/mysql/test/.empty (EMPTY) diff --git a/extra/mysql/.footprint.x86_64 b/extra/mysql/.footprint.x86_64 index 3c547ea72..ac628b559 100644 --- a/extra/mysql/.footprint.x86_64 +++ b/extra/mysql/.footprint.x86_64 @@ -19,6 +19,12 @@ drwxr-xr-x root/root etc/rc.d/rc6.d/ lrwxrwxrwx root/root etc/rc.d/rc6.d/K26mysql -> ../init.d/mysql drwxr-xr-x root/root etc/rc.d/rcsysinit.d/ drwxr-xr-x root/root etc/sysconfig/ +drwxr-xr-x root/root srv/ +drwx------ root/root srv/mysql/ +drwx------ root/root srv/mysql/mysql/ +-rwx------ root/root srv/mysql/mysql/.empty (EMPTY) +drwx------ root/root srv/mysql/test/ +-rwx------ root/root srv/mysql/test/.empty (EMPTY) drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/innochecksum @@ -213,10 +219,3 @@ drwxr-xr-x root/root usr/share/mysql/swedish/ -rw-r--r-- root/root usr/share/mysql/swedish/errmsg.sys drwxr-xr-x root/root usr/share/mysql/ukrainian/ -rw-r--r-- root/root usr/share/mysql/ukrainian/errmsg.sys -drwxr-xr-x root/root var/ -drwxr-xr-x root/root var/lib/ -drwx------ root/root var/lib/mysql/ -drwx------ root/root var/lib/mysql/mysql/ --rwx------ root/root var/lib/mysql/mysql/.empty (EMPTY) -drwx------ root/root var/lib/mysql/test/ --rwx------ root/root var/lib/mysql/test/.empty (EMPTY) diff --git a/extra/mysql/.md5sum.i686 b/extra/mysql/.md5sum.i686 index c2ff66857..7456d6e8f 100644 --- a/extra/mysql/.md5sum.i686 +++ b/extra/mysql/.md5sum.i686 @@ -1 +1 @@ -befa4e0d0aa95be6c8f6f143ae3b0641 mysql-5.5.11.tar.gz +19f43bb9c72b1b5f7ff86a7f921c9244 mysql-5.5.14.tar.gz diff --git a/extra/mysql/.md5sum.x86_64 b/extra/mysql/.md5sum.x86_64 index c2ff66857..7456d6e8f 100644 --- a/extra/mysql/.md5sum.x86_64 +++ b/extra/mysql/.md5sum.x86_64 @@ -1 +1 @@ -befa4e0d0aa95be6c8f6f143ae3b0641 mysql-5.5.11.tar.gz +19f43bb9c72b1b5f7ff86a7f921c9244 mysql-5.5.14.tar.gz diff --git a/extra/mysql/Pkgfile b/extra/mysql/Pkgfile index 8500cabcd..3e4e1460d 100644 --- a/extra/mysql/Pkgfile +++ b/extra/mysql/Pkgfile @@ -6,10 +6,9 @@ # Run on: mysqlclient name=mysql -version=5.5.11 -#5.1.55 +version=5.5.14 release=1 -source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.5/$name-$version.tar.gz) +source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-${version%.*}/$name-$version.tar.gz) build () { source /etc/blfs-bootscripts @@ -26,7 +25,7 @@ build () { cmake ../mysql-$version \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DMYSQL_DATADIR=/var/lib/mysql \ + -DMYSQL_DATADIR=/srv/mysql \ -DSYSCONFDIR=/etc/mysql \ -DINSTALL_INFODIR=share/mysql/docs \ -DINSTALL_MANDIR=share/man \ @@ -77,9 +76,9 @@ build () { # These shouldn't be here rm -r $PKG/usr/docs - install -d $PKG/var/lib/mysql - cp -r $PKG/usr/data/* $PKG/var/lib/mysql/ - chmod -R 700 $PKG/var/lib/mysql + install -d $PKG/srv/mysql + cp -r $PKG/usr/data/* $PKG/srv/mysql/ + chmod -R 700 $PKG/srv/mysql # cd $name-$version # libtoolize --force diff --git a/extra/mysql/post-install b/extra/mysql/post-install index 056fe5500..0815530c8 100755 --- a/extra/mysql/post-install +++ b/extra/mysql/post-install @@ -1,6 +1,6 @@ #!/bin/sh -mysql_install_db --user=mysql +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 |