[arch-commits] Commit in mysql/trunk (PKGBUILD mysql.install)

[Bartłomiej Piotrowski]

    Date: Wednesday, February 20, 2013 @ 18:18:07
  Author: bpiotrowski
Revision: 178354

upgpkg: mysql 5.5.30-4

- don't ship /var/lib/mysql in package
- run mysql_install_db only if MySQL datadir is not present
- enable ARCHIVE and BLACKHOLE storage engines (FS#33935)

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysql.install

---------------+
 PKGBUILD      |    8 ++++----
 mysql.install |   13 ++++++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-20 17:01:28 UTC (rev 178353)
+++ PKGBUILD	2013-02-20 17:18:07 UTC (rev 178354)
@@ -5,7 +5,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.30
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('GPL')
 url="https://www.mysql.com/products/community/"
@@ -53,9 +53,9 @@
     -DWITH_EMBEDDED_SERVER=ON \
     -DWITH_INNOBASE_STORAGE_ENGINE=1 \
     -DWITH_PARTITION_STORAGE_ENGINE=1 \
+    -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
+    -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
     -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
-    -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
     -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
     -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
     -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti"
@@ -127,5 +127,5 @@
   rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench}
   rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
 
-  install -dm700 "${pkgdir}"/var/lib/mysql
+  #install -dm700 "${pkgdir}"/var/lib/mysql
 }

Modified: mysql.install
===================================================================
--- mysql.install	2013-02-20 17:01:28 UTC (rev 178353)
+++ mysql.install	2013-02-20 17:18:07 UTC (rev 178354)
@@ -1,9 +1,16 @@
 post_install(){
+  datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p")
+  [[ -z $datadir ]] && datadir=/var/lib/mysql
+
   groupadd -g 89 mysql &>/dev/null
-  useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
-  usr/bin/mysql_install_db --user=mysql --basedir=/usr
-  chown -R mysql:mysql var/lib/mysql &>/dev/null
+  useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
 
+  if [[ ! -e $datadir ]]; then
+    install -dm700 $datadir
+    usr/bin/mysql_install_db --user=mysql --basedir=/usr
+    chown -R mysql:mysql var/lib/mysql &>/dev/null
+  fi
+
   usr/bin/systemd-tmpfiles --create mysqld.conf
 }