diff --git a/packages/databases/mysql/package.mk b/packages/databases/mysql/package.mk index ba26f88038..438b857974 100644 --- a/packages/databases/mysql/package.mk +++ b/packages/databases/mysql/package.mk @@ -19,140 +19,98 @@ ################################################################################ PKG_NAME="mysql" -PKG_VERSION="5.6.13" +PKG_VERSION="5.1.70" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="http://www.mysql.com" -PKG_URL="http://cdn.mysql.com/Downloads/MySQL-5.6/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://ftp.gwdg.de/pub/misc/$PKG_NAME/Downloads/MySQL-5.1/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="zlib ncurses" -PKG_BUILD_DEPENDS_HOST="toolchain zlib openssl ncurses" -PKG_BUILD_DEPENDS_TARGET="toolchain zlib openssl ncurses mysql:host" +PKG_BUILD_DEPENDS_HOST="toolchain zlib:host" +PKG_BUILD_DEPENDS_TARGET="toolchain zlib ncurses mysql:host" PKG_PRIORITY="optional" PKG_SECTION="database" PKG_SHORTDESC="mysql: A database server" PKG_LONGDESC="MySQL is a SQL (Structured Query Language) database server. SQL is the most popular database language in the world. MySQL is a client server implementation that consists of a server daemon mysqld and many different client programs/libraries." PKG_IS_ADDON="no" -PKG_AUTORECONF="no" +PKG_AUTORECONF="yes" -pre_configure_host() { - sed -i "/ADD_SUBDIRECTORY(sql\/share)/d" ../CMakeLists.txt - sed -i "s/ADD_SUBDIRECTORY(libmysql)/&\\nADD_SUBDIRECTORY(sql\/share)/" ../CMakeLists.txt - sed -i "s@data/test@\${INSTALL_MYSQLSHAREDIR}@g" ../sql/CMakeLists.txt - sed -i "s@data/mysql@\${INSTALL_MYSQLTESTDIR}@g" ../sql/CMakeLists.txt -} +TARGET_CFLAGS="$TARGET_CFLAGS -fPIC -DPIC" -# package specific configure options -configure_host() { - cmake -DCMAKE_INSTALL_PREFIX=$TOOLCHAIN \ - -DCMAKE_BUILD_TYPE=Release \ - -DWITHOUT_SERVER=OFF \ - -DWITH_EMBEDDED_SERVER=OFF \ - -DWITH_EXTRA_CHARSETS=none \ - -DWITH_EDITLINE=bundled \ - -DWITH_LIBEVENT=bundled \ - -DWITH_SSL=bundled \ - -DWITH_UNIT_TESTS=OFF \ - -DWITH_ZLIB=bundled \ - .. -} +PKG_CONFIGURE_OPTS_HOST="--with-zlib-dir=$ROOT/$TOOLCHAIN" + +PKG_CONFIGURE_OPTS_TARGET="ac_cv_c_stack_direction=-1 \ + ac_cv_sys_restartable_syscalls=yes \ + --localstatedir=/storage/.mysql \ + --with-unix-socket-path=/var/tmp/mysql.socket \ + --with-tcp-port=3306 \ + --enable-static \ + --disable-shared \ + --with-low-memory \ + --enable-largefile \ + --with-big-tables \ + --with-mysqld-user=mysqld \ + --with-extra-charsets=all \ + --with-pthread \ + --with-named-thread-libs=-lpthread \ + --enable-thread-safe-client \ + --enable-assembler \ + --enable-local-infile \ + --without-debug \ + --without-docs \ + --without-man \ + --with-readline \ + --without-libwrap \ + --without-pstack \ + --without-server \ + --without-embedded-server \ + --without-libedit \ + --with-query-cache \ + --without-plugin-partition \ + --without-plugin-daemon_example \ + --without-plugin-ftexample \ + --without-plugin-archive \ + --without-plugin-blackhole \ + --without-plugin-example \ + --without-plugin-federated \ + --without-plugin-ibmdb2i \ + --without-plugin-innobase \ + --without-plugin-innodb_plugin \ + --without-plugin-ndbcluster" make_host() { - make comp_err - make gen_lex_hash - make comp_sql - make gen_pfs_lex_token + make -C include my_config.h + make -C mysys libmysys.a + make -C strings libmystrings.a + make -C dbug factorial + make -C vio libvio.a + make -C dbug libdbug.a + make -C regex libregex.a + make -C sql gen_lex_hash + make -C scripts comp_sql + make -C extra comp_err } makeinstall_host() { - mkdir -p $ROOT/$TOOLCHAIN/bin - cp -PR extra/comp_err $ROOT/$TOOLCHAIN/bin - cp -PR sql/gen_lex_hash $ROOT/$TOOLCHAIN/bin - cp -PR scripts/comp_sql $ROOT/$TOOLCHAIN/bin - cp -PR storage/perfschema/gen_pfs_lex_token $ROOT/$TOOLCHAIN/bin -} - -configure_target() { - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \ - -DCMAKE_BUILD_TYPE=Release \ - -DFEATURE_SET=community \ - -DDISABLE_SHARED=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_DOCDIR=share/doc/mysql \ - -DINSTALL_DOCREADMEDIR=share/doc/mysql \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_INFODIR=share/info \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_MYSQLDATADIR=/storage/.mysql \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_MYSQLTESTDIR=share/mysql/test \ - -DINSTALL_PLUGINDIR=lib/mysql/plugin \ - -DINSTALL_SBINDIR=sbin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_SQLBENCHDIR=share/mysql/bench \ - -DINSTALL_SUPPORTFILESDIR=share/mysql/support \ - -DMYSQL_DATADIR=/storage/.mysql \ - -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \ - -DSYSCONFDIR=/etc/mysql \ - -DWITHOUT_SERVER=OFF \ - -DWITH_EMBEDDED_SERVER=OFF \ - -DWITH_PARTITION_STORAGE_ENGINE=OFF \ - -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON \ - -DWITH_EXTRA_CHARSETS=all \ - -DENABLE_DTRACE=OFF \ - -DWITH_EDITLINE=bundled \ - -DWITH_LIBEVENT=bundled \ - -DWITH_SSL=system \ - -DWITH_UNIT_TESTS=OFF \ - -DWITH_ZLIB=system \ - -DSTACK_DIRECTION=1 \ - .. -} - -pre_make_target() { -# copy host binaries back - should be fixed - cp -PR ../.$HOST_NAME/scripts/comp_sql ../scripts/comp_sql + cp -PR dbug/factorial $ROOT/$TOOLCHAIN/bin/mysql-factorial + cp -PR sql/gen_lex_hash $ROOT/$TOOLCHAIN/bin/mysql-gen_lex_hash + cp -PR scripts/comp_sql $ROOT/$TOOLCHAIN/bin/mysql-comp_sql + cp -PR extra/comp_err $ROOT/$TOOLCHAIN/bin/mysql-comp_err } post_makeinstall_target() { sed -i "s|pkgincludedir=.*|pkgincludedir=\'$SYSROOT_PREFIX/usr/include/mysql\'|" scripts/mysql_config sed -i "s|pkglibdir=.*|pkglibdir=\'$SYSROOT_PREFIX/usr/lib/mysql\'|" scripts/mysql_config + cp scripts/mysql_config $SYSROOT_PREFIX/usr/bin + ln -sf $SYSROOT_PREFIX/usr/bin/mysql_config $ROOT/$TOOLCHAIN/bin/mysql_config - mkdir -p $ROOT/$TOOLCHAIN/bin - cp -PR scripts/mysql_config $ROOT/$TOOLCHAIN/bin + for i in `ls -d $SYSROOT_PREFIX/usr/lib/mysql/*.a`; do + ln -v -sf $i $SYSROOT_PREFIX/usr/lib + done rm -rf $INSTALL/usr/bin - rm -rf $INSTALL/usr/sbin - rm -rf $INSTALL/usr/lib/mysql/plugin - rm -rf $INSTALL/usr/share/mysql/bench - rm -rf $INSTALL/usr/share/mysql/support - rm -rf $INSTALL/usr/share/mysql/test - - if [ "$MYSQL_SERVER" = "yes" ]; then - mkdir -p $INSTALL/usr/bin - cp -P extra/resolveip $INSTALL/usr/bin - cp -P extra/my_print_defaults $INSTALL/usr/bin - cp -P client/mysql $INSTALL/usr/bin - cp -P client/mysqladmin $INSTALL/usr/bin - cp -P ../scripts/mysql_install_db.sh $INSTALL/usr/bin/mysql_install_db - chmod +x $INSTALL/usr/bin/mysql_install_db - sed -e 's,@localstatedir@,/storage/.mysql,g' \ - -e 's,@bindir@,/usr/bin,g' \ - -e 's,@prefix@,/usr,g' \ - -e 's,@libexecdir@,/usr/sbin,g' \ - -e 's,@pkgdatadir@,/usr/share/mysql,g' \ - -e 's,@scriptdir@,/usr/bin,g' \ - -e 's,^.basedir=.*,basedir="/usr",g' \ - -e 's,@HOSTNAME@,cat /proc/sys/kernel/hostname,g' \ - -i $INSTALL/usr/bin/mysql_install_db - - mkdir -p $INSTALL/usr/sbin - cp -P sql/mysqld $INSTALL/usr/sbin - - mkdir -p $INSTALL/etc/init.d - cp $PKG_DIR/scripts/* $INSTALL/etc/init.d - else - rm -rf $INSTALL/usr/share/mysql - fi + rm -rf $INSTALL/usr/mysql-test + rm -rf $INSTALL/usr/share/mysql + rm -rf $INSTALL/usr/sql-bench } diff --git a/packages/databases/mysql/patches/mysql-010_crosscompiling.patch b/packages/databases/mysql/patches/mysql-010_crosscompiling.patch new file mode 100644 index 0000000000..b6c3e068a1 --- /dev/null +++ b/packages/databases/mysql/patches/mysql-010_crosscompiling.patch @@ -0,0 +1,128 @@ +diff -Naur mysql-5.1.38/dbug/Makefile.am mysql-5.1.38.patch/dbug/Makefile.am +--- mysql-5.1.38/dbug/Makefile.am 2009-08-21 14:09:22.000000000 +0200 ++++ mysql-5.1.38.patch/dbug/Makefile.am 2009-09-10 02:57:59.000000000 +0200 +@@ -44,19 +44,19 @@ + -groff -mm user.r > $@ + + output1.r: factorial +- ./factorial 1 2 3 4 5 | cat > $@ ++ mysql-factorial 1 2 3 4 5 | cat > $@ + + output2.r: factorial +- ./factorial -\#t:o 2 3 | cat >$@ ++ mysql-factorial -\#t:o 2 3 | cat >$@ + + output3.r: factorial +- ./factorial -\#d:t:o 3 | cat >$@ ++ mysql-factorial -\#d:t:o 3 | cat >$@ + + output4.r: factorial +- ./factorial -\#d,result:o 4 | cat >$@ ++ mysql-factorial -\#d,result:o 4 | cat >$@ + + output5.r: factorial +- ./factorial -\#d:f,factorial:F:L:o 3 | cat >$@ ++ mysql-factorial -\#d:f,factorial:F:L:o 3 | cat >$@ + .c.r: + @RM@ -f $@ + @SED@ -e 's!\\!\\\\!g' $< > $@ +diff -Naur mysql-5.1.38/dbug/Makefile.in mysql-5.1.38.patch/dbug/Makefile.in +--- mysql-5.1.38/dbug/Makefile.in 2009-08-21 14:17:15.000000000 +0200 ++++ mysql-5.1.38.patch/dbug/Makefile.in 2009-09-10 02:58:14.000000000 +0200 +@@ -746,19 +746,19 @@ + -groff -mm user.r > $@ + + output1.r: factorial +- ./factorial 1 2 3 4 5 | cat > $@ ++ mysql-factorial 1 2 3 4 5 | cat > $@ + + output2.r: factorial +- ./factorial -\#t:o 2 3 | cat >$@ ++ mysql-factorial -\#t:o 2 3 | cat >$@ + + output3.r: factorial +- ./factorial -\#d:t:o 3 | cat >$@ ++ mysql-factorial -\#d:t:o 3 | cat >$@ + + output4.r: factorial +- ./factorial -\#d,result:o 4 | cat >$@ ++ mysql-factorial -\#d,result:o 4 | cat >$@ + + output5.r: factorial +- ./factorial -\#d:f,factorial:F:L:o 3 | cat >$@ ++ mysql-factorial -\#d:f,factorial:F:L:o 3 | cat >$@ + .c.r: + @RM@ -f $@ + @SED@ -e 's!\\!\\\\!g' $< > $@ +diff -Naur mysql-5.1.38/extra/Makefile.am mysql-5.1.38.patch/extra/Makefile.am +--- mysql-5.1.38/extra/Makefile.am 2009-08-21 14:09:23.000000000 +0200 ++++ mysql-5.1.38.patch/extra/Makefile.am 2009-09-10 02:53:50.000000000 +0200 +@@ -32,7 +32,7 @@ + $(top_builddir)/include/mysqld_error.h: comp_err.c \ + $(top_srcdir)/sql/share/errmsg.txt + $(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT) +- $(top_builddir)/extra/comp_err$(EXEEXT) \ ++ mysql-comp_err$(EXEEXT) \ + --charset=$(top_srcdir)/sql/share/charsets \ + --out-dir=$(top_builddir)/sql/share/ \ + --header_file=$(top_builddir)/include/mysqld_error.h \ +diff -Naur mysql-5.1.38/extra/Makefile.in mysql-5.1.38.patch/extra/Makefile.in +--- mysql-5.1.38/extra/Makefile.in 2009-08-21 14:17:16.000000000 +0200 ++++ mysql-5.1.38.patch/extra/Makefile.in 2009-09-10 02:53:16.000000000 +0200 +@@ -936,7 +936,7 @@ + $(top_builddir)/include/mysqld_error.h: comp_err.c \ + $(top_srcdir)/sql/share/errmsg.txt + $(MAKE) $(AM_MAKEFLAGS) comp_err$(EXEEXT) +- $(top_builddir)/extra/comp_err$(EXEEXT) \ ++ mysql-comp_err$(EXEEXT) \ + --charset=$(top_srcdir)/sql/share/charsets \ + --out-dir=$(top_builddir)/sql/share/ \ + --header_file=$(top_builddir)/include/mysqld_error.h \ +diff -Naur mysql-5.1.38/scripts/Makefile.am mysql-5.1.38.patch/scripts/Makefile.am +--- mysql-5.1.38/scripts/Makefile.am 2009-08-21 14:11:26.000000000 +0200 ++++ mysql-5.1.38.patch/scripts/Makefile.am 2009-09-10 02:57:01.000000000 +0200 +@@ -121,7 +121,7 @@ + mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql + $(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT) + sleep 2 +- $(top_builddir)/scripts/comp_sql$(EXEEXT) \ ++ mysql-comp_sql$(EXEEXT) \ + mysql_fix_privilege_tables \ + $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@ + +diff -Naur mysql-5.1.38/scripts/Makefile.in mysql-5.1.38.patch/scripts/Makefile.in +--- mysql-5.1.38/scripts/Makefile.in 2009-08-21 14:17:23.000000000 +0200 ++++ mysql-5.1.38.patch/scripts/Makefile.in 2009-09-10 02:57:11.000000000 +0200 +@@ -802,7 +802,7 @@ + mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql + $(MAKE) $(AM_MAKEFLAGS) comp_sql$(EXEEXT) + sleep 2 +- $(top_builddir)/scripts/comp_sql$(EXEEXT) \ ++ mysql-comp_sql$(EXEEXT) \ + mysql_fix_privilege_tables \ + $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@ + +diff -Naur mysql-5.1.38/sql/Makefile.am mysql-5.1.38.patch/sql/Makefile.am +--- mysql-5.1.38/sql/Makefile.am 2009-08-21 14:12:24.000000000 +0200 ++++ mysql-5.1.38.patch/sql/Makefile.am 2009-09-10 02:55:09.000000000 +0200 +@@ -174,7 +174,7 @@ + # this avoid the rebuild of the built files in a source dist + lex_hash.h: gen_lex_hash.cc lex.h + $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT) +- ./gen_lex_hash$(EXEEXT) > $@-t ++ mysql-gen_lex_hash$(EXEEXT) > $@-t + $(MV) $@-t $@ + + # For testing of udf_example.so +diff -Naur mysql-5.1.38/sql/Makefile.in mysql-5.1.38.patch/sql/Makefile.in +--- mysql-5.1.38/sql/Makefile.in 2009-08-21 14:17:25.000000000 +0200 ++++ mysql-5.1.38.patch/sql/Makefile.in 2009-09-10 02:55:22.000000000 +0200 +@@ -1302,7 +1302,7 @@ + # this avoid the rebuild of the built files in a source dist + lex_hash.h: gen_lex_hash.cc lex.h + $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT) +- ./gen_lex_hash$(EXEEXT) > $@-t ++ mysql-gen_lex_hash$(EXEEXT) > $@-t + $(MV) $@-t $@ + + # We might have some stuff not built in this build, but that we want to install diff --git a/packages/databases/mysql/scripts/54_mysql b/packages/databases/mysql/scripts/54_mysql deleted file mode 100644 index 697337669d..0000000000 --- a/packages/databases/mysql/scripts/54_mysql +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -# start MySql Server -# -# runlevels: openelec, textmode - -MYSQL_DATADIR="$CONFIG_CACHE/mysql" - -( - progress "Starting MySql server" - mkdir -p /run/mysqld - - if [ ! -d "$MYSQL_DATADIR" ]; then - progress "Creating MySql Database" - mkdir -p "$MYSQL_DATADIR" - mysql_install_db --user=root --datadir="$MYSQL_DATADIR" > /dev/null 2>&1 - mysqld --user=root --datadir="$MYSQL_DATADIR" > /dev/null 2>&1 & - usleep 3000000 - mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY 'openelec' WITH GRANT OPTION;" > /dev/null 2>&1 - mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' IDENTIFIED BY 'openelec' WITH GRANT OPTION;" > /dev/null 2>&1 - - killall mysqld - usleep 2000000 - fi - - mysqld --user=root --datadir="$MYSQL_DATADIR" > /dev/null 2>&1 -)& diff --git a/packages/graphics/bcm2835-driver/profile.d/display.conf b/packages/graphics/bcm2835-driver/profile.d/display.conf index 56487e4d8f..ed0ab96f8d 100644 --- a/packages/graphics/bcm2835-driver/profile.d/display.conf +++ b/packages/graphics/bcm2835-driver/profile.d/display.conf @@ -28,5 +28,5 @@ # stub function wait_for_xorg () { echo 0 > /sys/class/vtconsole/vtcon1/bind - # fbset -g 1 1 1 1 32 + fbset -g 1 1 1 1 32 } diff --git a/packages/mediacenter/service.openelec.settings/meta b/packages/mediacenter/service.openelec.settings/meta index bf752be6b1..ca81715b5f 100644 --- a/packages/mediacenter/service.openelec.settings/meta +++ b/packages/mediacenter/service.openelec.settings/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="service.openelec.settings" -PKG_VERSION="0.2.6" +PKG_VERSION="0.2.7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="prop." diff --git a/packages/mediacenter/service.openelec.settings/patches.upstream/service.openelec.settings-folders.patch b/packages/mediacenter/service.openelec.settings/patches.upstream/service.openelec.settings-folders.patch new file mode 100644 index 0000000000..0befb3a182 --- /dev/null +++ b/packages/mediacenter/service.openelec.settings/patches.upstream/service.openelec.settings-folders.patch @@ -0,0 +1,122 @@ +From b0f33807f0dadf11d1b007204607d98d9f17d8f7 Mon Sep 17 00:00:00 2001 +From: lufi +Date: Sun, 18 Aug 2013 22:16:45 +0200 +Subject: [PATCH 1/3] Update defaults.py + +--- + defaults.py | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/defaults.py b/defaults.py +index 7a582de..16e78e8 100755 +--- a/defaults.py ++++ b/defaults.py +@@ -144,11 +144,11 @@ + + _services = \ + { +- "sshd" : ["sshd.service"], +- "avahi" : ["avahi-daemon.service"], +- "samba" : ["nmbd.service", "smbd.service"], +- "bluetooth" : ["bluetooth.service"], +- "obexd" : ["obex.service"], +- "syslog" : ["syslog.service"], +- "cron" : ["cron.service"], +- } +\ No newline at end of file ++ "sshd" : ["sshd.service"], ++ "avahi" : ["avahi-daemon.service"], ++ "samba" : ["nmbd.service", "smbd.service"], ++ "bluez" : ["bluetooth.service"], ++ "obexd" : ["obex.service"], ++ "syslog" : ["syslog.service"], ++ "cron" : ["cron.service"], ++ } +-- +1.8.1.6 + + +From 26d02eb4b2ca01e975a4c0b4c8a91a8010147cbf Mon Sep 17 00:00:00 2001 +From: lufi +Date: Sun, 18 Aug 2013 22:21:28 +0200 +Subject: [PATCH 2/3] change old service config files to .cache/services/ dir + +--- + oe.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/oe.py b/oe.py +index 7df2ba2..d3db4b4 100755 +--- a/oe.py ++++ b/oe.py +@@ -213,7 +213,7 @@ def set_service_option(service, option, value): + lines = [] + changed = False + +- conf_file_name = '%s/service_%s.conf' % (CONFIG_CACHE, service) ++ conf_file_name = '%s/services/%s.conf' % (CONFIG_CACHE, service) + + if os.path.isfile(conf_file_name): + with open(conf_file_name, "r") as conf_file: +@@ -239,7 +239,7 @@ def get_service_option(service, option, default=None): + conf_file_name = '' + + if not SYSTEMD: +- conf_file_name = '%s/service_%s.conf' % (CONFIG_CACHE, service) ++ conf_file_name = '%s/services/%s.conf' % (CONFIG_CACHE, service) + else: + if os.path.exists('%s/services/%s.conf' % (CONFIG_CACHE, service)): + conf_file_name = '%s/services/%s.conf' % (CONFIG_CACHE, service) +-- +1.8.1.6 + + +From adfcc15ae01cecc78a63613d2b46f08b8e7f6713 Mon Sep 17 00:00:00 2001 +From: lufi +Date: Mon, 19 Aug 2013 13:34:13 +0200 +Subject: [PATCH 3/3] Update services.py + +--- + resources/lib/modules/services.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/resources/lib/modules/services.py b/resources/lib/modules/services.py +index 9ec987b..d4d96a6 100755 +--- a/resources/lib/modules/services.py ++++ b/resources/lib/modules/services.py +@@ -399,12 +399,12 @@ def load_values(self): + self.struct['bluez']['settings']['enabled']['value'] = '0' + + if os.path.isfile(self.oe.dictModules['bluetooth'].OBEX_DAEMON): +- if self.oe.get_service_option('bluez', 'OBEXD_ENABLED', 'true') == 'true': ++ if self.oe.get_service_option('obexd', 'OBEXD_ENABLED', 'true') == 'true': + self.struct['bluez']['settings']['obex_enabled']['value'] = '1' + else: + self.struct['bluez']['settings']['obex_enabled']['value'] = '0' + +- tmpVal = self.oe.get_service_option('bluez', 'OBEXD_ROOT', ++ tmpVal = self.oe.get_service_option('obexd', 'OBEXD_ROOT', + self.oe.dictModules['bluetooth'].D_OBEXD_ROOT) + if not tmpVal is None: + self.struct['bluez']['settings']['obex_root']['value'] = tmpVal +@@ -946,14 +946,14 @@ def init_bluetooth(self, **kwargs): + if not self.oe.SYSTEMD: + if self.struct['bluez']['settings']['obex_enabled']['value'] == '0': + +- self.oe.set_service_option('bluez', ++ self.oe.set_service_option('obexd', + 'OBEXD_ENABLED', + 'false') + else: +- self.oe.set_service_option('bluez', ++ self.oe.set_service_option('obexd', + 'OBEXD_ENABLED', + 'true') +- self.oe.set_service_option('bluez', ++ self.oe.set_service_option('obexd', + 'OBEXD_ROOT', + self.struct['bluez']['settings' + ]['obex_root']['value']) +-- +1.8.1.6 + diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 1d42292d66..e34729ab63 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="12.2-7da5ea4" +PKG_VERSION="12.2-5ba69b6" if [ "$XBMC" = "master" ]; then PKG_VERSION="13.alpha-df91888" elif [ "$XBMC" = "xbmc-aml" ]; then diff --git a/packages/mediacenter/xbmc/config/advancedsettings.xml b/packages/mediacenter/xbmc/config/advancedsettings.xml index 865b948b78..5024fd8baf 100644 --- a/packages/mediacenter/xbmc/config/advancedsettings.xml +++ b/packages/mediacenter/xbmc/config/advancedsettings.xml @@ -19,6 +19,6 @@ 30 - 4.0 + 4.0 diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index f02f904917..f9398a22f2 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="12.2-7da5ea4" +PKG_VERSION="12.2-5ba69b6" if [ "$XBMC" = "master" ]; then PKG_VERSION="13.alpha-df91888" elif [ "$XBMC" = "xbmc-aml" ]; then diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/todo/xbmc-990.27-PR2232.patch.bk b/packages/mediacenter/xbmc/patches/12.2-5ba69b6/todo/xbmc-990.27-PR2232.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/todo/xbmc-990.27-PR2232.patch.bk rename to packages/mediacenter/xbmc/patches/12.2-5ba69b6/todo/xbmc-990.27-PR2232.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk b/packages/mediacenter/xbmc/patches/12.2-5ba69b6/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk rename to packages/mediacenter/xbmc/patches/12.2-5ba69b6/todo/xbmc-995.03-OMXPlayer-Audio-fix_incorrect_usage_of_flag_talled.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk b/packages/mediacenter/xbmc/patches/12.2-5ba69b6/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk rename to packages/mediacenter/xbmc/patches/12.2-5ba69b6/todo/xbmc-995.04-OMXPlayer-some_caching_fixes_for_pvr.patch.bk diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-321-texturepacker-hostflags-and-rework.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-321-texturepacker-hostflags-and-rework.patch rename to packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-321-texturepacker-hostflags-and-rework.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-452-change_lcd_content-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-452-change_lcd_content-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-452-change_lcd_content-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-453-add_openelec.tv_RSS_news-0.1.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-453-add_openelec.tv_RSS_news-0.1.patch rename to packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-453-add_openelec.tv_RSS_news-0.1.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-990.00-remove-windowed-display-mode.patch b/packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-990.00-remove-windowed-display-mode.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-990.00-remove-windowed-display-mode.patch rename to packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-990.00-remove-windowed-display-mode.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch b/packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch rename to packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-990.24-smbnfsdeinit-and-wait-for-nic-on-wakeup.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-995.11-enable-vpp-deinterlacing.patch b/packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-995.11-enable-vpp-deinterlacing.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-995.11-enable-vpp-deinterlacing.patch rename to packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-995.11-enable-vpp-deinterlacing.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch b/packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch rename to packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch diff --git a/packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-995.13-vpp-fix-skipping.patch b/packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-995.13-vpp-fix-skipping.patch similarity index 100% rename from packages/mediacenter/xbmc/patches/12.2-7da5ea4/xbmc-995.13-vpp-fix-skipping.patch rename to packages/mediacenter/xbmc/patches/12.2-5ba69b6/xbmc-995.13-vpp-fix-skipping.patch diff --git a/packages/network/avahi/init.d/53_avahi b/packages/network/avahi/init.d/53_avahi index 1831782af0..6144abbcc1 100644 --- a/packages/network/avahi/init.d/53_avahi +++ b/packages/network/avahi/init.d/53_avahi @@ -35,8 +35,8 @@ mkdir -p /var/run/avahi-daemon while true; do AVAHI_ENABLED=true - if [ -f $CONFIG_CACHE/service_avahi.conf ]; then - . $CONFIG_CACHE/service_avahi.conf + if [ -f $CONFIG_CACHE/services/avahi.conf ]; then + . $CONFIG_CACHE/services/avahi.conf fi if [ "$AVAHI_ENABLED" == "true" ]; then wait_for_dbus diff --git a/packages/network/avahi/package.mk b/packages/network/avahi/package.mk index 495d8c40b6..17fa2bc3d1 100644 --- a/packages/network/avahi/package.mk +++ b/packages/network/avahi/package.mk @@ -56,7 +56,7 @@ PKG_CONFIGURE_OPTS_TARGET="py_cv_mod_gtk_=yes \ --enable-python-dbus \ --disable-mono \ --disable-monodoc \ - --enable-autoipd \ + --disable-autoipd \ --disable-doxygen-doc \ --disable-doxygen-dot \ --disable-doxygen-man \ @@ -71,13 +71,11 @@ PKG_CONFIGURE_OPTS_TARGET="py_cv_mod_gtk_=yes \ --disable-manpages \ --disable-xmltoman \ --disable-tests \ - --enable-compat-libdns_sd \ + --disable-compat-libdns_sd \ --disable-compat-howl \ --with-xml=expat \ --with-avahi-user=avahi \ --with-avahi-group=avahi \ - --with-autoipd-user=avahiautoipd \ - --with-autoipd-group=avahiautoipd \ --disable-nls" post_makeinstall_target() { @@ -92,7 +90,6 @@ post_makeinstall_target() { # browse domains? sed -e "s,^.*browse-domains=.*$,# browse-domains=,g" -i $INSTALL/etc/avahi/avahi-daemon.conf - rm -rf $INSTALL/etc/avahi/avahi-autoipd.action rm -rf $INSTALL/etc/avahi/avahi-dnsconfd.action rm -rf $INSTALL/etc/avahi/services/ssh.service if [ ! $SFTP_SERVER = "yes" ]; then @@ -100,7 +97,6 @@ post_makeinstall_target() { fi rm -rf $INSTALL/lib/systemd rm -f $INSTALL/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service - rm -f $INSTALL/usr/sbin/avahi-autoipd rm -f $INSTALL/usr/sbin/avahi-dnsconfd rm -f $INSTALL/usr/bin/avahi-bookmarks rm -f $INSTALL/usr/bin/avahi-publish* @@ -110,7 +106,4 @@ post_makeinstall_target() { post_install() { add_user avahi x 495 495 "avahi-daemon" "/var/run/avahi-daemon" "/bin/sh" add_group avahi 495 - - add_user avahiautoipd x 496 496 "avahi-autoipd" "/var/lib/avahi-autoipd" "/bin/sh" - add_group avahiautoipd 496 } diff --git a/packages/network/bluez/init.d/54_bluez b/packages/network/bluez/init.d/54_bluez index b3887cb6b9..b429fb519d 100644 --- a/packages/network/bluez/init.d/54_bluez +++ b/packages/network/bluez/init.d/54_bluez @@ -33,8 +33,8 @@ fi BLUEZ_ENABLED=true - if [ -f $CONFIG_CACHE/service_bluez.conf ]; then - . $CONFIG_CACHE/service_bluez.conf + if [ -f $CONFIG_CACHE/services/bluez.conf ]; then + . $CONFIG_CACHE/services/bluez.conf fi if [ "$BLUEZ_ENABLED" == "true" ]; then diff --git a/packages/network/bluez/init.d/55_obexd b/packages/network/bluez/init.d/55_obexd index 1f0f5b67f0..65df521839 100644 --- a/packages/network/bluez/init.d/55_obexd +++ b/packages/network/bluez/init.d/55_obexd @@ -34,14 +34,17 @@ OBEXD_ENABLED=true OBEXD_ROOT=/storage/downloads - if [ -f $CONFIG_CACHE/service_bluez.conf ]; then - . $CONFIG_CACHE/service_bluez.conf + if [ -f $CONFIG_CACHE/services/bluez.conf ]; then + . $CONFIG_CACHE/services/bluez.conf + fi + if [ -f $CONFIG_CACHE/services/obexd.conf ]; then + . $CONFIG_CACHE/services/obexd.conf fi if [ "$BLUEZ_ENABLED" == "true" -a "$OBEXD_ENABLED" == "true" ]; then progress "Starting obexd" wait_for_dbus - mkdir -p "$OBEXD_ROOT" + mkdir -p "$OBEXD_ROOT" &>/dev/null /usr/lib/bluetooth/obexd $OBEXD_DEBUG -r "$OBEXD_ROOT" &>/dev/null fi )& diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk index cef3ce9e0f..db06fcb3f6 100644 --- a/packages/network/connman/package.mk +++ b/packages/network/connman/package.mk @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="connman" -PKG_VERSION="38c1662" +PKG_VERSION="8378438" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/openssh/init.d/51_sshd b/packages/network/openssh/init.d/51_sshd index a5dc2f9ce7..da76b423f1 100644 --- a/packages/network/openssh/init.d/51_sshd +++ b/packages/network/openssh/init.d/51_sshd @@ -27,8 +27,8 @@ . /etc/profile SSHD_START=false - if [ -f $CONFIG_CACHE/service_ssh.conf ]; then - . $CONFIG_CACHE/service_ssh.conf + if [ -f $CONFIG_CACHE/services/ssh.conf ]; then + . $CONFIG_CACHE/services/ssh.conf fi # Check if password authentication is disabled diff --git a/packages/network/samba/scripts/52_samba b/packages/network/samba/scripts/52_samba index 1f844ecaff..6e473ed6fd 100644 --- a/packages/network/samba/scripts/52_samba +++ b/packages/network/samba/scripts/52_samba @@ -28,8 +28,8 @@ . /etc/profile SAMBA_ENABLED=true - if [ -f $CONFIG_CACHE/service_samba.conf ]; then - . $CONFIG_CACHE/service_samba.conf + if [ -f $CONFIG_CACHE/services/samba.conf ]; then + . $CONFIG_CACHE/services/samba.conf fi if [ "$SAMBA_ENABLED" = "true" ]; then diff --git a/packages/sysutils/busybox/init.d/05_syslogd b/packages/sysutils/busybox/init.d/05_syslogd index dcfd7e0e7b..86617fd93a 100644 --- a/packages/sysutils/busybox/init.d/05_syslogd +++ b/packages/sysutils/busybox/init.d/05_syslogd @@ -29,8 +29,8 @@ . /etc/profile SYSLOG_REMOTE=false - if [ -e $CONFIG_CACHE/service_syslog.conf ] ; then - . $CONFIG_CACHE/service_syslog.conf + if [ -e $CONFIG_CACHE/services/syslog.conf ] ; then + . $CONFIG_CACHE/services/syslog.conf fi SYSLOGD_OPTIONS="-L" diff --git a/packages/sysutils/busybox/scripts/09_crond b/packages/sysutils/busybox/scripts/09_crond index cd003d6210..ec4288518f 100644 --- a/packages/sysutils/busybox/scripts/09_crond +++ b/packages/sysutils/busybox/scripts/09_crond @@ -29,8 +29,8 @@ . /etc/profile CRON_ENABLED=true - if [ -f $CONFIG_CACHE/service_cron.conf ]; then - . $CONFIG_CACHE/service_cron.conf + if [ -f $CONFIG_CACHE/services/cron.conf ]; then + . $CONFIG_CACHE/services/cron.conf fi if [ "$CRON_ENABLED" == "true" ]; then diff --git a/projects/ARCTIC_MC/xbmc/advancedsettings.xml b/projects/ARCTIC_MC/xbmc/advancedsettings.xml index 00b8b641e5..6568c6735b 100644 --- a/projects/ARCTIC_MC/xbmc/advancedsettings.xml +++ b/projects/ARCTIC_MC/xbmc/advancedsettings.xml @@ -19,7 +19,7 @@ 30 - 4.0 + 4.0 diff --git a/projects/ATV/xbmc/advancedsettings.xml b/projects/ATV/xbmc/advancedsettings.xml index 4144f87606..27ce108942 100644 --- a/projects/ATV/xbmc/advancedsettings.xml +++ b/projects/ATV/xbmc/advancedsettings.xml @@ -21,7 +21,7 @@ 30 - 4.0 + 4.0 diff --git a/projects/Fusion/xbmc/advancedsettings.xml b/projects/Fusion/xbmc/advancedsettings.xml index 00b8b641e5..6568c6735b 100644 --- a/projects/Fusion/xbmc/advancedsettings.xml +++ b/projects/Fusion/xbmc/advancedsettings.xml @@ -19,7 +19,7 @@ 30 - 4.0 + 4.0 diff --git a/projects/RPi/xbmc/advancedsettings.xml b/projects/RPi/xbmc/advancedsettings.xml index 88feb05800..1bb69747c7 100644 --- a/projects/RPi/xbmc/advancedsettings.xml +++ b/projects/RPi/xbmc/advancedsettings.xml @@ -29,7 +29,7 @@ 30 - 4.0 + 4.0