LAMP update

index 192abd7..19f1be9 100644
@@ -1,8 +1,8 @@
 SECTION = "console/network"
 DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the apache php module."
 LICENSE = "PHP-3.0"
-DEPENDS = "apache2-native apache2 zlib bzip2"
 INC_PR = "r1"
+DEPENDS = "apache2-native apache2 zlib bzip2 libmcrypt"
 
 SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2 \
            file://configure.patch \

@@ -12,7 +12,7 @@ SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2 \
 
 S = "${WORKDIR}/php-${PV}"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=cb564efdf78cce8ea6e4b5a4f7c05d97"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=5bb09683f8f09b15b7076f4b4c31d61f"
 
 inherit autotools
 

@@ -39,6 +39,7 @@ EXTRA_OECONF = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs \
                 --libdir=${libdir}/php5 \
                 --with-zlib --with-zlib-dir=${STAGING_DIR_TARGET}${exec_prefix} \
                 --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \
+                --with-mcrypt=${STAGING_DIR_TARGET}${exec_prefix} \
                 --enable-zip \
                 --enable-mbstring \
                 --with-config-file-path=${sysconfdir}/php/apache2-php5"

deleted file mode 100644
index 7d90dc8..0000000
@@ -1,4 +0,0 @@
-include modphp5.inc
-
-SRC_URI[md5sum] = "145ea5e845e910443ff1eddb3dbcf56a"
-SRC_URI[sha256sum] = "2d2285da48ccd2db311b2608fdfafd18b363a9f7e3796d53dd53e5b6752a0136"

new file mode 100644
index 0000000..3c23242
@@ -0,0 +1,7 @@
+include modphp5.inc
+
+EXTRA_OECONF += "--disable-opcache"
+
+SRC_URI[md5sum] = "caf7f4d86514a568fb3c8021b096a9f0"
+SRC_URI[sha256sum] = "e72aaf1fa96eac0bff127bfc74c174d1de50cd3f66d7e0e1ee919674ab463bb7"
+

similarity index 100%
rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-configure_perlbin.patch
rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.6/apache-configure_perlbin.patch

similarity index 100%
rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.4/apache-ssl-ltmain-rpath.patch
rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.6/apache-ssl-ltmain-rpath.patch

similarity index 100%
rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.4/fix-libtool-name.patch
rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.6/fix-libtool-name.patch

similarity index 100%
rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.1-corelimit.patch
rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.6/httpd-2.4.1-corelimit.patch

similarity index 100%
rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.1-selinux.patch
rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.6/httpd-2.4.1-selinux.patch

similarity index 100%
rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.4-export.patch
rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.6/httpd-2.4.4-export.patch

similarity index 100%
rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.4/httpd-2.4.4-r1332643.patch
rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.6/httpd-2.4.4-r1332643.patch

similarity index 100%
rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.4/replace-lynx-to-curl-in-apachectl-script.patch
rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.6/replace-lynx-to-curl-in-apachectl-script.patch

similarity index 100%
rename from meta-webserver/recipes-httpd/apache2/apache2-2.4.4/server-makefile.patch
rename to meta-webserver/recipes-httpd/apache2/apache2-2.4.6/server-makefile.patch

similarity index 89%
rename from meta-webserver/recipes-httpd/apache2/apache2-native_2.4.4.bb
rename to meta-webserver/recipes-httpd/apache2/apache2-native_2.4.6.bb
index 2855648..6efd469 100644
@@ -13,8 +13,8 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2"
 S = "${WORKDIR}/httpd-${PV}"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=eff226ae95d0516d6210ed77dfdf2dcc"
-SRC_URI[md5sum] = "0e712ee2119cd798c8ae39d5f11a9206"
-SRC_URI[sha256sum] = "92aabddeca76a4ac7330b143df1407bbf35574c7291c15172238ac598d97655c"
+SRC_URI[md5sum] = "ea5e361ca37b8d7853404419dd502efe"
+SRC_URI[sha256sum] = "dc9f3625ebc08bea55eeb0d16e71fba656f252e6cd0aa244ee7806dc3b022fea"
 
 do_configure () {
     ./configure --with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \

similarity index 97%
rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.4.bb
rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.6.bb
index 8c9416a..f230f94 100644
@@ -19,8 +19,8 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \
            file://init"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=eff226ae95d0516d6210ed77dfdf2dcc"
-SRC_URI[md5sum] = "0e712ee2119cd798c8ae39d5f11a9206"
-SRC_URI[sha256sum] = "92aabddeca76a4ac7330b143df1407bbf35574c7291c15172238ac598d97655c"
+SRC_URI[md5sum] = "ea5e361ca37b8d7853404419dd502efe"
+SRC_URI[sha256sum] = "dc9f3625ebc08bea55eeb0d16e71fba656f252e6cd0aa244ee7806dc3b022fea"
 
 S = "${WORKDIR}/httpd-${PV}"
 

similarity index 87%
rename from meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.8.1.bb
rename to meta-webserver/recipes-php/phpmyadmin/phpmyadmin_4.0.5.bb
index e48e515..f97dc91 100644
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a \
 SRC_URI = "${SOURCEFORGE_MIRROR}/phpmyadmin/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \
            file://apache.conf"
 
-SRC_URI[md5sum] = "76976c227041ac7109506b29aec3083a"
-SRC_URI[sha256sum] = "c66737ff55369b1c9e4b116e68f3c517faf7c4bc17e289d008d74fde6c8260f6"
+SRC_URI[md5sum] = "5cc493908d09df1760c7cdcd1622ebf7"
+SRC_URI[sha256sum] = "f4df1190441ce5e094183cfadf8aec4af3a4f131339599e6380a1c6ac0a11fe4"
 
 S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages"
 

deleted file mode 100644
index 669393a..0000000
@@ -1,319 +0,0 @@
-diff -aurp mysql-4.1.22.old/acinclude.m4 mysql-4.1.22/acinclude.m4
---- mysql-4.1.22.old/acinclude.m4	2008-09-18 13:00:13.000000000 -0500
-+++ mysql-4.1.22/acinclude.m4	2008-09-18 12:58:41.000000000 -0500
-@@ -1,5 +1,88 @@
- # Local macros for automake & autoconf
- 
-+AH_TEMPLATE([SPRINTF_RETURNS_INT], [sprintf returns an int])
-+AH_TEMPLATE([SPRINTF_RETURNS_PTR], [sprintf returns a char *])
-+AH_TEMPLATE([SPRINTF_RETURNS_GARBAGE], [sprintf returns something unknown to us])
-+
-+AC_DEFUN([MYSQL_SPRINTF_RET], [
-+  AC_CACHE_CHECK([return type of sprintf],
-+	         [mysql_cv_func_sprintf_ret], [
-+    old_CFLAGS="$CFLAGS"
-+    CFLAGS="$CFLAGS -Werror"
-+    AC_COMPILE_IFELSE([
-+#include <stdio.h>
-+int sprintf(char *str, const char *format, ...);
-+      ], [mysql_cv_func_sprintf_ret=int],
-+      AC_COMPILE_IFELSE([
-+#include <stdio.h>
-+char * sprintf(char *str, const char *format, ...);
-+        ], [mysql_cv_func_sprintf_ret=ptr],
-+	[mysql_cv_func_sprintf_ret=unknown])
-+    )
-+    CFLAGS="$old_CFLAGS"
-+  ])
-+  if test x"$mysql_cv_func_sprintf_ret" = "xint"; then
-+    AC_DEFINE([SPRINTF_RETURNS_INT], [1])
-+  elif test x"$mysql_cv_func_sprintf_ret" = "xptr"; then
-+    AC_DEFINE([SPRINTF_RETURNS_PTR], [1])
-+  else
-+    AC_DEFINE([SPRINTF_RETURNS_GARBAGE], [1])
-+  fi
-+])
-+
-+# _MYSQL_FUNC_ATOMIC_ADD
-+# ----------------------
-+# Check for Linux specific atomic_add function
-+AC_DEFUN([_MYSQL_FUNC_ATOMIC_ADD],
-+[AC_CACHE_CHECK([for atomic_add], [mysql_cv_func_atomic_add],
-+[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <asm/atomic.h>]],
-+                                [
-+int main()
-+{
-+  atomic_t v;
-+
-+  atomic_set(&v, 23);
-+  atomic_add(5, &v);
-+  return atomic_read(&v) == 28 ? 0 : -1;
-+}
-+				])],
-+                   [mysql_cv_func_atomic_add=yes],
-+                   [mysql_cv_func_atomic_add=no])])
-+  if test x"$mysql_func_atomic_add" = "xyes"; then
-+    AC_DEFINE([HAVE_ATOMIC_ADD], [1])
-+  fi[]dnl
-+])# _MYSQL_FUNC_ATOMIC_ADD
-+
-+# _MYSQL_FUNC_ATOMIC_SUB
-+# ----------------------
-+# Check for Linux specific atomic_sub function
-+AC_DEFUN([_MYSQL_FUNC_ATOMIC_SUB],
-+[AC_CACHE_CHECK([for atomic_sub], [mysql_cv_func_atomic_sub],
-+[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <asm/atomic.h>]],
-+                                [
-+int main()
-+{
-+  atomic_t v;
-+
-+  atomic_set(&v, 23);
-+  atomic_sub(5, &v);
-+  return atomic_read(&v) == 18 ? 0 : -1;
-+}
-+				])],
-+                   [mysql_cv_func_atomic_sub=yes],
-+                   [mysql_cv_func_atomic_sub=no])])
-+  if test x"$mysql_func_atomic_sub" = "xyes"; then
-+    AC_DEFINE([HAVE_ATOMIC_SUB], [1])
-+  fi[]dnl
-+])# _MYSQL_FUNC_ATOMIC_SUB
-+
-+# MYSQL_FUNCS_ATOMIC
-+# ------------------
-+# Check for Linux specific atomic add and sub functions
-+AC_DEFUN([MYSQL_FUNCS_ATOMIC], [
-+  AC_REQUIRE([_MYSQL_FUNC_ATOMIC_ADD])dnl
-+  AC_REQUIRE([_MYSQL_FUNC_ATOMIC_SUB])dnl
-+])# MYSQL_FUNCS_ATOMIC
- 
- AC_DEFUN([MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY], [
-     AC_CACHE_CHECK([HIST_ENTRY is declared in readline/readline.h], mysql_cv_hist_entry_declared,
-@@ -344,7 +427,7 @@ dnl ------------------------------------
- AC_DEFUN([MYSQL_CHECK_ULONG],
- [AC_MSG_CHECKING(for type ulong)
- AC_CACHE_VAL(ac_cv_ulong,
--[AC_TRY_RUN([#include <stdio.h>
-+[AC_TRY_LINK([#include <stdio.h>
- #include <sys/types.h>
- main()
- {
-@@ -362,7 +445,7 @@ fi
- AC_DEFUN([MYSQL_CHECK_UCHAR],
- [AC_MSG_CHECKING(for type uchar)
- AC_CACHE_VAL(ac_cv_uchar,
--[AC_TRY_RUN([#include <stdio.h>
-+[AC_TRY_LINK([#include <stdio.h>
- #include <sys/types.h>
- main()
- {
-@@ -380,7 +463,7 @@ fi
- AC_DEFUN([MYSQL_CHECK_UINT],
- [AC_MSG_CHECKING(for type uint)
- AC_CACHE_VAL(ac_cv_uint,
--[AC_TRY_RUN([#include <stdio.h>
-+[AC_TRY_LINK([#include <stdio.h>
- #include <sys/types.h>
- main()
- {
-@@ -399,7 +482,7 @@ fi
- AC_DEFUN([MYSQL_CHECK_IN_ADDR_T],
- [AC_MSG_CHECKING(for type in_addr_t)
- AC_CACHE_VAL(ac_cv_in_addr_t,
--[AC_TRY_RUN([#include <stdio.h>
-+[AC_TRY_LINK([#include <stdio.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-@@ -460,7 +543,7 @@ fi
- AC_DEFUN([MYSQL_CHECK_FP_EXCEPT],
- [AC_MSG_CHECKING(for type fp_except)
- AC_CACHE_VAL(ac_cv_fp_except,
--[AC_TRY_RUN([#include <stdio.h>
-+[AC_TRY_LINK([#include <stdio.h>
- #include <sys/types.h>
- #include <ieeefp.h>
- main()
-diff -aurp mysql-4.1.22.old/configure.in mysql-4.1.22/configure.in
---- mysql-4.1.22.old/configure.in	2008-09-18 13:00:14.000000000 -0500
-+++ mysql-4.1.22/configure.in	2008-09-18 12:54:00.000000000 -0500
-@@ -236,8 +236,6 @@ then
- else
-   AC_PATH_PROG(AS, as, as)
- fi
--# Still need ranlib for readline; local static use only so no libtool.
--AC_PROG_RANLIB
- # We use libtool
- #AC_LIBTOOL_WIN32_DLL
- AC_PROG_LIBTOOL
-@@ -258,44 +256,7 @@ AC_PROG_YACC
- AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf)
- AC_CHECK_PROG(DVIS,      tex,    manual.dvi)
- 
--AC_MSG_CHECKING("return type of sprintf")
--
--#check the return type of sprintf
--case $SYSTEM_TYPE in
--  *netware*)
--    AC_DEFINE(SPRINTF_RETURNS_INT, [1]) AC_MSG_RESULT("int")
--    ;;
--  *)
--AC_TRY_RUN([
--  int main()
--    {
--      char* s = "hello";
--      char buf[6];
--      if((int)sprintf(buf, s) == strlen(s))
--	return 0;
--      
--      return -1;
--     }
--   ],
--   [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
--   AC_MSG_RESULT("int")],
--   [AC_TRY_RUN([
-- int main()
--   {
--     char* s = "hello";
--     char buf[6];
--     if((char*)sprintf(buf,s) == buf + strlen(s))
--       return 0;
--     return -1;
--   }           ],
--               [AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf])
--                AC_MSG_RESULT("ptr")],
--               [AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf])
--                AC_MSG_RESULT("garbage")])
--   ])
--    ;;
--esac
--
-+MYSQL_SPRINTF_RET
- 
- # option, cache_name, variable,
- # code to execute if yes, code to exectute if fail
-@@ -878,47 +839,7 @@ struct request_info *req;
- AC_SUBST(WRAPLIBS)
- 
- if test "$TARGET_LINUX" = "true"; then
--  AC_MSG_CHECKING([for atomic operations])
--
--  AC_LANG_SAVE
--  AC_LANG_CPLUSPLUS
--
--  atom_ops=
--  AC_TRY_RUN([
--#include <asm/atomic.h>
--int main()
--{
--  atomic_t v;
--
--  atomic_set(&v, 23);
--  atomic_add(5, &v);
--  return atomic_read(&v) == 28 ? 0 : -1;
--}
--  ],
--  [AC_DEFINE([HAVE_ATOMIC_ADD], [1],
--             [atomic_add() from <asm/atomic.h> (Linux only)])
--   atom_ops="${atom_ops}atomic_add "],
--  )
--  AC_TRY_RUN([
--#include <asm/atomic.h>
--int main()
--{
--  atomic_t v;
--
--  atomic_set(&v, 23);
--  atomic_sub(5, &v);
--  return atomic_read(&v) == 18 ? 0 : -1;
--}
--  ],
--  [AC_DEFINE([HAVE_ATOMIC_SUB], [1],
--             [atomic_sub() from <asm/atomic.h> (Linux only)])
--   atom_ops="${atom_ops}atomic_sub "],
--  )
--
--  if test -z "$atom_ops"; then atom_ops="no"; fi
--  AC_MSG_RESULT($atom_ops)
--
--  AC_LANG_RESTORE
-+  MYSQL_FUNC_ATOMIC
- 
-   AC_ARG_WITH(pstack,
-     [  --with-pstack           Use the pstack backtrace library],
-@@ -971,13 +892,13 @@ fi
- # Later in this script LIBS will be augmented with a threads library.
- NON_THREADED_LIBS="$LIBS"
- 
--AC_MSG_CHECKING([for int8])
-+AC_CACHE_CHECK([for int8], [mysql_cv_type_int8], [
- case $SYSTEM_TYPE in
-   *netware)
-     AC_MSG_RESULT([no])
-     ;;
-   *)
--AC_TRY_RUN([
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([[
- #ifdef HAVE_STDLIB_H
- #include <stdlib.h>
- #endif
-@@ -988,22 +909,21 @@ AC_TRY_RUN([
- 
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
--#endif
--
-+#endif]], [
- int main()
- {
-   int8 i;
-   return 0;
--}
--],
--[AC_DEFINE([HAVE_INT_8_16_32], [1],
--           [whether int8, int16 and int32 types exist])
--AC_MSG_RESULT([yes])],
--[AC_MSG_RESULT([no])]
--)
-+}])], [mysql_cv_type_int8=yes], [mysql_cv_type_int8=no])
-     ;;
- esac
- 
-+if test x"$mysql_cv_type_int8" = "xyes"; then
-+  AC_DEFINE([HAVE_INT_8_16_32], [1],
-+           [whether int8, int16 and int32 types exist])
-+fi
-+])
-+
- #
- # Some system specific hacks
- #
-@@ -1814,7 +1734,7 @@ then
-   AC_MSG_ERROR("MySQL needs a long long type.")
- fi
- # off_t is not a builtin type
--MYSQL_CHECK_SIZEOF(off_t, 4)
-+AC_CHECK_SIZEOF(off_t, 4)
- if test "$ac_cv_sizeof_off_t" -eq 0
- then
-   AC_MSG_ERROR("MySQL needs a off_t type.")
-diff -aurp mysql-4.1.22.old/innobase/configure.in mysql-4.1.22/innobase/configure.in
---- mysql-4.1.22.old/innobase/configure.in	2008-09-18 13:00:14.000000000 -0500
-+++ mysql-4.1.22/innobase/configure.in	2008-09-18 12:55:39.000000000 -0500
-@@ -3,6 +3,7 @@ AC_INIT
- AC_CANONICAL_SYSTEM
- AM_MAINTAINER_MODE
- AM_CONFIG_HEADER(ib_config.h)
-+AC_CONFIG_AUX_DIR([..])
- AM_INIT_AUTOMAKE(ib, 0.90)
- 
- # This is need before AC_PROG_CC
-@@ -32,7 +33,6 @@ CFLAGS="$CFLAGS "
- CXXFLAGS="$CXXFLAGS "
- 
- AC_PROG_CC
--AC_PROG_RANLIB
- AC_PROG_INSTALL
- AC_PROG_LIBTOOL
- AC_CHECK_HEADERS(aio.h sched.h)

deleted file mode 100644
index 85560eb..0000000
@@ -1,21 +0,0 @@
-[client]
-#password					= password
-port						= 3306
-socket						= /tmp/mysql.sock
-
-[mysqld_safe]
-err-log						= /var/log/mysql.err
-
-[mysqld]
-user 						= mysql
-port 						= 3306
-socket 						= /tmp/mysql.sock
-pid-file 					= /var/lib/mysql/mysqld.pid
-log-error 					= /var/log/mysqld.err
-basedir 					= /usr
-datadir 					= /var/mysql
-skip-locking
-skip-innodb
-skip-networking
-bind-address					= localhost
-

similarity index 54%
rename from meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb
rename to meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
index dcaf0c6..19cc33b 100644
@@ -1,9 +1,5 @@
-require mysql5_${PV}.inc
+require mariadb_${PV}.inc
 inherit native
-PR ="r3"
-
-SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \
-           file://fix-abi-check-gcc45.patch"
 
 RDEPENDS_${PN} = ""
 PACKAGES = ""

@@ -20,5 +16,3 @@ do_install() {
     install -m 0755 sql/gen_lex_hash ${D}${bindir}/
 }
 
-SRC_URI[md5sum] = "32e7373c16271606007374396e6742ad"
-SRC_URI[sha256sum] = "2b0737b84e7b42c9e54c9658d23bfaee1189cd5955f26b10bdb862761d0f0432"

similarity index 100%
rename from meta-oe/recipes-support/mysql/mysql5/Makefile.am.patch
rename to meta-oe/recipes-support/mysql/mariadb/Makefile.am.patch

similarity index 100%
rename from meta-oe/recipes-support/mysql/files/configure-ps-cache-check.patch
rename to meta-oe/recipes-support/mysql/mariadb/configure-ps-cache-check.patch

new file mode 100644
index 0000000..6fe2dfa
@@ -0,0 +1,13 @@
+Index: mysql-5.1.40/configure.in
+===================================================================
+--- mysql-5.1.40.orig/configure.in
++++ mysql-5.1.40/configure.in
+@@ -226,8 +226,6 @@ else
+   AC_PATH_PROG(AS, as, as)
+ fi
+ 
+-# Still need ranlib for readline; local static use only so no libtool.
+-AC_PROG_RANLIB
+ # We use libtool
+ #AC_LIBTOOL_WIN32_DLL
+ AC_PROG_LIBTOOL

174 lines not on this page · raw message

257 lines not on this page · raw message

similarity index 100%
rename from meta-oe/recipes-support/mysql/files/fix_host_path.patch
rename to meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch

similarity index 100%
rename from meta-oe/recipes-support/mysql/mysql5/misc.m4.patch
rename to meta-oe/recipes-support/mysql/mariadb/misc.m4.patch

similarity index 94%
rename from meta-oe/recipes-support/mysql/mysql5/my.cnf
rename to meta-oe/recipes-support/mysql/mariadb/my.cnf
index 7f557e4..8470817 100644
@@ -15,7 +15,7 @@ log-error 					= /var/log/mysqld.err
 basedir 					= /usr
 datadir 					= /var/mysql
 skip-locking
-loose-skip-innodb
 skip-networking
+ignore-builtin-innodb
 bind-address					= localhost
 

similarity index 100%
rename from meta-oe/recipes-support/mysql/files/mysqld.sh
rename to meta-oe/recipes-support/mysql/mariadb/mysqld.sh

405 lines not on this page · raw message

new file mode 100644
index 0000000..fdf20dc
@@ -0,0 +1,14 @@
+require ${PN}_${PV}.inc
+
+DEPENDS += "mariadb-native"
+
+PROVIDES += "mysql5"
+
+RPROVIDES_${PN}-client = "mysql5-client"
+RREPLACES_${PN}-client = "mysql5-client"
+RCONFLICTS_${PN}-client = "mysql5-client"
+
+RPROVIDES_${PN}-server = "mysql5-server"
+RREPLACES_${PN}-server = "mysql5-server"
+RCONFLICTS_${PN}-server = "mysql5-server"
+

134 lines not on this page · raw message

deleted file mode 100644
index 3b5b3fd..0000000
@@ -1,27 +0,0 @@
-Index: mysql-4.1.22/configure.in
-===================================================================
---- mysql-4.1.22.orig/configure.in	2009-01-28 16:33:28.000000000 +0000
-+++ mysql-4.1.22/configure.in	2009-01-28 16:43:26.000000000 +0000
-@@ -471,8 +471,8 @@
- 
- # Lock for PS
- AC_PATH_PROG(PS, ps, ps)
--AC_MSG_CHECKING("how to check if pid exists")
--PS=$ac_cv_path_PS
-+AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC],
-+[
- # Linux style
- if $PS p $$ 2> /dev/null | grep $0 > /dev/null
- then
-@@ -511,8 +511,9 @@
-       AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])
-   esac
- fi
--AC_SUBST(FIND_PROC)
--AC_MSG_RESULT("$FIND_PROC")
-+ac_cv_FIND_PROC="$FIND_PROC"
-+])
-+AC_SUBST([FIND_PROC], [$ac_cv_FIND_PROC])
- 
- # Check if a pid is valid
- AC_PATH_PROG(KILL, kill, kill)

54 lines not on this page · raw message

77 lines not on this page · raw message

deleted file mode 100644
index 4f69cd5..0000000
@@ -1,37 +0,0 @@
---- mysql-4.1.22/configure.in.old	2008-09-18 20:11:15.000000000 -0500
-+++ mysql-4.1.22/configure.in	2008-09-18 20:12:28.000000000 -0500
-@@ -456,9 +456,9 @@ else
-   fi
- fi
- 
--AC_SUBST(HOSTNAME)
--AC_SUBST(PERL)
--AC_SUBST(PERL5)
-+AC_SUBST(HOSTNAME,/bin/hostname)
-+AC_SUBST(PERL,$(bindir)/perl)
-+AC_SUBST(PERL5,$(bindir)/perl)
- 
- # for build ndb docs
- 
-@@ -516,16 +516,17 @@ AC_MSG_RESULT("$FIND_PROC")
- 
- # Check if a pid is valid
- AC_PATH_PROG(KILL, kill, kill)
-+AC_SUBST(KILL,/bin/kill)
- AC_MSG_CHECKING("for kill switches")
--if $ac_cv_path_KILL -0 $$
-+if $KILL -0 $$
- then
--  CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null"
-+  CHECK_PID="$KILL -0 \$\$PID > /dev/null 2> /dev/null"
- elif kill -s 0 $$
- then
--  CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
-+  CHECK_PID="$KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
- else
-   AC_MSG_WARN([kill -0 to check for pid seems to fail])
--    CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
-+    CHECK_PID="$KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
- fi
- AC_SUBST(CHECK_PID)
- AC_MSG_RESULT("$CHECK_PID")

deleted file mode 100644
index 479ebdb..0000000
@@ -1,24 +0,0 @@
-# MySQL init script
-
-. /etc/default/rcS
-
-case "$1" in
-	start)
-		/usr/bin/mysqld_safe &
-		;;
-	stop)
-		if test -f /var/lib/mysql/mysqld.pid ; then
-			PID=`cat /var/lib/mysql/mysqld.pid`
-			kill $PID
-		fi
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	*)
-		echo "Usage: /etc/init.d/mysqld {start|stop|restart}"
-		;;
-esac
-
-exit 0

deleted file mode 100644
index 70c39fa..0000000
@@ -1,40 +0,0 @@
-Index: mysql-5.1.40/storage/innodb_plugin/plug.in
-===================================================================
---- mysql-5.1.40.orig/storage/innodb_plugin/plug.in
-+++ mysql-5.1.40/storage/innodb_plugin/plug.in
-@@ -63,35 +63,6 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [
- 		;;
-   esac
-   AC_SUBST(INNODB_DYNAMIC_CFLAGS)
--  AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins)
--  AC_TRY_RUN(
--    [
--      #include <pthread.h>
--      #include <string.h>
--
--      int main(int argc, char** argv) {
--        pthread_t       x1;
--        pthread_t       x2;
--        pthread_t       x3;
--
--	memset(&x1, 0x0, sizeof(x1));
--	memset(&x2, 0x0, sizeof(x2));
--	memset(&x3, 0x0, sizeof(x3));
--
--        __sync_bool_compare_and_swap(&x1, x2, x3);
--
--        return(0);
--      }
--    ],
--    [
--      AC_DEFINE([HAVE_ATOMIC_PTHREAD_T], [1],
--                [pthread_t can be used by GCC atomic builtins])
--      AC_MSG_RESULT(yes)
--    ],
--    [
--      AC_MSG_RESULT(no)
--    ]
--    )
- 
-   # Try using solaris atomics on SunOS if GCC atomics are not available
-   AC_CHECK_DECLS(

deleted file mode 100644
index 9656358..0000000
@@ -1,6 +0,0 @@
-require ${PN}_${PV}.inc
-
-DEPENDS += "mysql5-native"
-
-SRC_URI[md5sum] = "32e7373c16271606007374396e6742ad"
-SRC_URI[sha256sum] = "2b0737b84e7b42c9e54c9658d23bfaee1189cd5955f26b10bdb862761d0f0432"