diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-11-04 20:24:19 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-11-04 20:24:19 +0100 |
| commit | c994c0a4526e8d7a16fecaceffde4f42ed1f45ff (patch) | |
| tree | 425228b7ccb286a5ee237a9be327214400d51b95 /recipes/mysql | |
| parent | d626f7db71c1a113e63c9b5e7c97394eb8ed4b59 (diff) | |
| parent | a0afb38137e89893bcd31b3a617cf60b0ed3cd9c (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/mysql')
| -rw-r--r-- | recipes/mysql/files/my.cnf | 2 | ||||
| -rw-r--r-- | recipes/mysql/mysql_4.1.22.bb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/recipes/mysql/files/my.cnf b/recipes/mysql/files/my.cnf index 15a8b1b4ab..46f5316bc5 100644 --- a/recipes/mysql/files/my.cnf +++ b/recipes/mysql/files/my.cnf @@ -10,7 +10,7 @@ err-log = /var/log/mysql.err user = mysql port = 3306 socket = /tmp/mysql.sock -pid-file = /var/run/mysqld.pid +pid-file = /var/run/mysql/mysqld.pid log-error = /var/log/mysqld.err basedir = /usr datadir = /var/mysql diff --git a/recipes/mysql/mysql_4.1.22.bb b/recipes/mysql/mysql_4.1.22.bb index b6718cb0cb..dae1dd6701 100644 --- a/recipes/mysql/mysql_4.1.22.bb +++ b/recipes/mysql/mysql_4.1.22.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mysql.com/" SECTION = "libs" LICENSE = "GPL" DEPENDS = "ncurses" -PR = "r4" +PR = "r5" SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ @@ -63,7 +63,8 @@ pkg_postinst_mysql-server () { #Install the database test -d /usr/bin || mkdir -p /usr/bin test -e /usr/bin/hostname || ln -s /bin/hostname /usr/bin/hostname - chmod go+rw /var/run + mkdir /var/run/mysql + chown mysql.nogroup /var/run/mysql mysql_install_db @@ -74,6 +75,7 @@ pkg_postrm_mysql-server () { } PACKAGES = "${PN}-dbg ${PN} libmysqlclient libmysqlclient-dev mysql-client mysql-server ${PN}-leftovers" +CONFFILES_mysql-server = "${sysconfdir}/my.cnf" FILES_${PN} = " " RDEPENDS_${PN} = "mysql-client mysql-server" |