diff options
| -rw-r--r-- | recipes/mysql/files/my.cnf | 2 | ||||
| -rw-r--r-- | recipes/mysql/mysql_4.1.22.bb | 6 | ||||
| -rw-r--r-- | recipes/mythtv/mythplugins_0.21+0.22rc2.bb | 20 | ||||
| -rw-r--r-- | recipes/mythtv/mythtv_0.21+0.22rc2.bb | 6 |
4 files changed, 25 insertions, 9 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" diff --git a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb b/recipes/mythtv/mythplugins_0.21+0.22rc2.bb index 31025329a3..82b61db469 100644 --- a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb +++ b/recipes/mythtv/mythplugins_0.21+0.22rc2.bb @@ -1,9 +1,9 @@ # todo: add mythweb DEPENDS = "flac taglib mythtv libvorbis libexif libvisual libsdl-x11 libcdaudio cdparanoia" RDEPENDS_${PN} = "mytharchive mythbrowser mythflix mythgallery \ - mythgame mythmusic mythmovies mythnews mythvideo mythweather" + mythgame mythmusic mythmovies mythnews mythvideo mythweather mythzoneminder" PV = "0.21+0.22rc2" -PR = "r3" +PR = "r4" QMAKE_PROFILES = "mythplugins.pro" @@ -47,7 +47,8 @@ PACKAGES =+ "mytharchive mytharchive-dbg \ mythmusic mythmusic-dbg \ mythnews mythnews-dbg \ mythvideo mythvideo-dbg \ - mythweather mythweather-dbg" + mythweather mythweather-dbg \ + mythzoneminder mythzoneminder-dbg" FILES_mytharchive = "${libdir}/mythtv/plugins/libmytharchive.so \ ${bindir}/mytharchivehelper \ @@ -256,3 +257,16 @@ FILES_mythweather = "${libdir}/mythtv/plugins/libmythweather.so \ ${datadir}/mythtv/weather_settings.xml \ " FILES_mythweather-dbg = "${libdir}/mythtv/plugins/.debug/libmythweather.so" + +FILES_mythzoneminder = "${libdir}/mythtv/plugins/libmythzoneminder.so \ + ${datadir}/mythtv/zonemindermenu.xml \ + ${datadir}/mythtv/i18n/mythzoneminder* \ + ${datadir}/mythtv/themes/default/zoneminder-ui.xml \ + ${datadir}/mythtv/themes/default/mz_black.png \ + ${datadir}/mythtv/themes/default/mz_browser_back_sel.png \ + ${datadir}/mythtv/themes/default/mz_browser_back_reg.png \ + ${datadir}/mythtv/themes/default/mz_function_popup.png \ + ${datadir}/mythtv/themes/default/mz_testcard.png \ + ${datadir}/mythtv/themes/default-wide/zoneminder-ui.xml \ + " +FILES_mythzoneminder-dbg = "${libdir}/mythtv/plugins/.debug/libmythzoneminder.so" diff --git a/recipes/mythtv/mythtv_0.21+0.22rc2.bb b/recipes/mythtv/mythtv_0.21+0.22rc2.bb index 38608797eb..8fc7ede429 100644 --- a/recipes/mythtv/mythtv_0.21+0.22rc2.bb +++ b/recipes/mythtv/mythtv_0.21+0.22rc2.bb @@ -1,11 +1,11 @@ require mythtv.inc -RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data" +RDEPENDS_${PN} = "mythtv-backend mythtv-frontend mythtv-bin mythtv-filters mythtv-data glibc-gconv-utf-16" PV = "0.21+0.22rc2" -PR = "r0" +PR = "r1" REALPV = "0.22" -#DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE = "-1" ALLOW_EMPTY_${PN} = "1" QMAKE_PROFILES = "mythtv.pro" |