diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-05-10 18:54:00 +0100 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-08-27 16:39:31 +0100 |
| commit | 72e23c12296fbc77193898c38426add58d0c2d71 (patch) | |
| tree | eed39116603d211504dabf316db4d42970b89871 /meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch | |
| parent | 336123c49e3d9a16429150dd96f60d423ccbd77b (diff) | |
| download | meta-openembedded-72e23c12296fbc77193898c38426add58d0c2d71.tar.gz | |
mysql5: replace with mariadb 5.1.67 and tweak
Switch to MariaDB (which is a drop-in replacement for MySQL) and use
the latest stable release from the 5.1 series.
* Update LIC_FILES_CHKSUM due to reformatted GPLv2 license text with
updated FSF address
* Refresh patches
* Add two patches from the upstream 5.1 branch to fix CVE-2013-1861
* Add a package for libmysqld (the embedded server library)
* Disable "maria" plugin since this fails to compile and doesn't
appear to be critical
* Drop some unrecognised/redundant options from EXTRA_OECONF
* Fix text relocation QA warnings introduced in the upgrade
* Convert to use useradd.bbclass for creating mysql user
* Set SUMMARY instead of description
* Move SRC_URI checksums to the version-specific inc file
* Clear out cruft in files/
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch')
| -rw-r--r-- | meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch b/meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch new file mode 100644 index 0000000000..4f69cd5198 --- /dev/null +++ b/meta-oe/recipes-support/mysql/mariadb/fix_host_path.patch | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | --- mysql-4.1.22/configure.in.old 2008-09-18 20:11:15.000000000 -0500 | ||
| 2 | +++ mysql-4.1.22/configure.in 2008-09-18 20:12:28.000000000 -0500 | ||
| 3 | @@ -456,9 +456,9 @@ else | ||
| 4 | fi | ||
| 5 | fi | ||
| 6 | |||
| 7 | -AC_SUBST(HOSTNAME) | ||
| 8 | -AC_SUBST(PERL) | ||
| 9 | -AC_SUBST(PERL5) | ||
| 10 | +AC_SUBST(HOSTNAME,/bin/hostname) | ||
| 11 | +AC_SUBST(PERL,$(bindir)/perl) | ||
| 12 | +AC_SUBST(PERL5,$(bindir)/perl) | ||
| 13 | |||
| 14 | # for build ndb docs | ||
| 15 | |||
| 16 | @@ -516,16 +516,17 @@ AC_MSG_RESULT("$FIND_PROC") | ||
| 17 | |||
| 18 | # Check if a pid is valid | ||
| 19 | AC_PATH_PROG(KILL, kill, kill) | ||
| 20 | +AC_SUBST(KILL,/bin/kill) | ||
| 21 | AC_MSG_CHECKING("for kill switches") | ||
| 22 | -if $ac_cv_path_KILL -0 $$ | ||
| 23 | +if $KILL -0 $$ | ||
| 24 | then | ||
| 25 | - CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null" | ||
| 26 | + CHECK_PID="$KILL -0 \$\$PID > /dev/null 2> /dev/null" | ||
| 27 | elif kill -s 0 $$ | ||
| 28 | then | ||
| 29 | - CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null" | ||
| 30 | + CHECK_PID="$KILL -s 0 \$\$PID > /dev/null 2> /dev/null" | ||
| 31 | else | ||
| 32 | AC_MSG_WARN([kill -0 to check for pid seems to fail]) | ||
| 33 | - CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null" | ||
| 34 | + CHECK_PID="$KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null" | ||
| 35 | fi | ||
| 36 | AC_SUBST(CHECK_PID) | ||
| 37 | AC_MSG_RESULT("$CHECK_PID") | ||
