mysql:

- remove server support

packages/databases/mysql/55_mysql

@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# start mysql server
-#
-# runlevels: openelec, text, debug
-
-. /etc/sysconfig
-
-if test "$OE_MYSQL_START" = "yes" -a -f /etc/my.cnf; then
-
-  if test ! -d $OE_MYSQL_DATADIR/mysql; then
-    progress "prepare MySQL Systemdatabase"
-
-    install -o mysqld -g mysqld -d $OE_MYSQL_DATADIR
-    mysql_install_db \
-      --datadir=$OE_MYSQL_DATADIR \
-      --user=mysqld
-  fi
-
-  progress "Starting MySQL server"
-
-  mysqld_safe \
-    --datadir=$OE_MYSQL_DATADIR \
-    --pid-file=$OE_MYSQL_PIDFILE \
-    --log-warnings \
-    --syslog &
-
-  while [ -f $OE_MYSQL_PIDFILE ]; do
-    sleep 10
-  done
-
-fi
-
-exit 0

packages/databases/mysql/build

@@ -42,7 +42,7 @@ ac_cv_sys_restartable_syscalls=yes \
             --with-readline \
             --without-libwrap \
             --without-pstack \
-            --with-server \
+            --without-server \
             --without-embedded-server \
             --without-libedit \
             --without-query-cache \

packages/databases/mysql/conf.d/mysqld

@@ -1,31 +0,0 @@
-################################################################################
-# MySQL Server environment variables.
-#
-# This file contains non-OpenELEC evironment variables as well as OpenELEC
-# evironment variables that are not user defined.
-################################################################################
-
-#-------------------------------------------------------------------------------
-# starting MySQL Server
-#-------------------------------------------------------------------------------
-OE_MYSQL_START=yes
-
-#-------------------------------------------------------------------------------
-# Location of MySQL Datadir
-#-------------------------------------------------------------------------------
-OE_MYSQL_DATADIR=/storage/.mysql
-
-#-------------------------------------------------------------------------------
-# Location of PID-File
-#-------------------------------------------------------------------------------
-OE_MYSQL_PIDFILE=/var/run/mysqld.pid
-
-#-------------------------------------------------------------------------------
-# Location of Socket-File
-#-------------------------------------------------------------------------------
-OE_MYSQL_SOCKETFILE=/var/tmp/mysql.socket
-
-#-------------------------------------------------------------------------------
-# Location of Log-File
-#-------------------------------------------------------------------------------
-OE_MYSQL_LOGFILE=/var/log/mysqld.log

packages/databases/mysql/config/my.cnf

@@ -1,12 +0,0 @@
-[mysqld]
-datadir=/storage/.mysql
-socket=/var/tmp/mysql.socket
-user=mysqld
-
-# Default to using old password format for compatibility with mysql 3.x
-# clients (those using the mysqlclient10 compatibility package).
-old_passwords=1
-
-[mysqld_safe]
-log-error=/var/log/mysqld.log
-pid-file=/var/run/mysqld.pid

packages/databases/mysql/init.d/55_mysql

@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# start mysql server
-#
-# runlevels: openelec, text, debug
-
-. /etc/sysconfig
-
-if test "$OE_MYSQL_START" = "yes"; then
-
-  # creating Logfile
-  touch $OE_MYSQL_LOGFILE
-  chown mysqld:mysqld $OE_MYSQL_LOGFILE
-  chmod 0640 $OE_MYSQL_LOGFILE
-
-  if test ! -d $OE_MYSQL_DATADIR/mysql; then
-    progress "prepare MySQL Systemdatabase"
-
-    # First, make sure $OE_MYSQL_DATADIR is there with correct permissions
-    if test ! -e "$OE_MYSQL_DATADIR" -a ! -h "$OE_MYSQL_DATADIR"; then
-      mkdir -p "$OE_MYSQL_DATADIR" || exit 1
-    fi
-    chown mysqld:mysqld "$OE_MYSQL_DATADIR"
-    chmod 0755 "$OE_MYSQL_DATADIR"
-
-    # Now create the database
-    /usr/bin/mysql_install_db \
-      --datadir=$OE_MYSQL_DATADIR \
-      --user=mysqld
-    chown -R mysqld:mysqld "$OE_MYSQL_DATADIR"
-  fi
-
-  progress "Starting MySQL server"
-
-  chown mysqld:mysqld "$OE_MYSQL_DATADIR"
-  chmod 0755 "$OE_MYSQL_DATADIR"
-  /usr/bin/mysqld_safe \
-    --datadir=$OE_MYSQL_DATADIR \
-    --socket="$OE_MYSQL_SOCKETFILE" \
-    --log-error="$OE_MYSQL_LOGFILE" \
-    --pid-file="$OE_MYSQL_PIDFILE" \
-    --user=mysqld >/dev/null 2>&1 &
-
-  STARTTIMEOUT=60
-  while [ $STARTTIMEOUT -gt 0 ]; do
-    RESPONSE=`/usr/bin/mysqladmin \
-                --socket="$OE_MYSQL_SOCKETFILE" \
-                --user=UNKNOWN_MYSQL_USER ping 2>&1` && break
-    echo "$RESPONSE" | grep -q "Access denied for user" && break
-    sleep 1
-    let STARTTIMEOUT=${STARTTIMEOUT}-1
-  done
-
-fi
-
-exit 0

packages/databases/mysql/install

@@ -4,34 +4,6 @@
 $SCRIPTS/install ncurses
 $SCRIPTS/install zlib
 
-PKG_DIR=`find $PACKAGES -type d -name $1`
-
-add_user mysqld x 27 484 "MySQL Server" "/var/lib/mysql" "/bin/sh"
-add_group mysqld 484
-
 mkdir -p $INSTALL/usr/lib
   cp -PR $PKG_BUILD/libmysql/.libs/libmysqlclient.so* $INSTALL/usr/lib
   cp -PR $PKG_BUILD/libmysql_r/.libs/libmysqlclient_r.so* $INSTALL/usr/lib
-
-mkdir -p $INSTALL/usr/bin
-  cp -PR $PKG_BUILD/client/.libs/mysql $INSTALL/usr/bin
-  cp -PR $PKG_BUILD/client/.libs/mysqladmin $INSTALL/usr/bin
-  cp -PR $PKG_BUILD/client/.libs/mysqldump $INSTALL/usr/bin
-  cp -PR $PKG_BUILD/extra/my_print_defaults $INSTALL/usr/bin
-  cp -PR $PKG_BUILD/extra/resolveip $INSTALL/usr/bin
-  cp -PR $PKG_BUILD/scripts/mysqld_safe $INSTALL/usr/bin
-  cp -PR $PKG_BUILD/scripts/mysql_install_db $INSTALL/usr/bin
-
-mkdir -p $INSTALL/usr/sbin
-  cp -PR $PKG_BUILD/sql/mysqld $INSTALL/usr/sbin/mysqld
-
-mkdir -p $INSTALL/usr/share/mysql/{charsets,english}
-  cp -PR $PKG_BUILD/scripts/mysql_system_tables.sql $INSTALL/usr/share/mysql
-  cp -PR $PKG_BUILD/scripts/mysql_system_tables_data.sql $INSTALL/usr/share/mysql
-  cp -PR $PKG_BUILD/scripts/fill_help_tables.sql $INSTALL/usr/share/mysql
-  cp -PR $PKG_BUILD/sql/share/charsets/*.xml $INSTALL/usr/share/mysql/charsets
-  cp -PR $PKG_BUILD/sql/share/english/errmsg.sys $INSTALL/usr/share/mysql/english
-  cp -PR $PKG_BUILD/sql/share/errmsg.txt $INSTALL/usr/share/mysql
-
-mkdir -p $INSTALL/etc
-  cp -PR $PKG_DIR/config/my.cnf $INSTALL/etc

packages/databases/mysql/my.cnf

@@ -1,39 +0,0 @@
-[client]
-#password	= your_password
-port		= 3306
-socket		= /var/tmp/.mysql.sock
-
-[mysqld]
-port		= 3306
-socket		= /var/tmp/.mysql.sock
-skip-locking
-key_buffer_size = 16M
-max_allowed_packet = 1M
-table_open_cache = 64
-sort_buffer_size = 512K
-net_buffer_length = 8K
-read_buffer_size = 256K
-read_rnd_buffer_size = 512K
-myisam_sort_buffer_size = 8M
-
-#skip-networking
-
-server-id	= 1
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[myisamchk]
-key_buffer_size = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
-[mysqlhotcopy]
-interactive-timeout