diff --git a/packages/3rdparty/driver/sundtek/meta b/packages/3rdparty/driver/sundtek/meta old mode 100755 new mode 100644 index 864657fa01..02003fea0c --- a/packages/3rdparty/driver/sundtek/meta +++ b/packages/3rdparty/driver/sundtek/meta @@ -19,9 +19,9 @@ ################################################################################ PKG_NAME="sundtek" -PKG_VERSION="20120525" +PKG_VERSION="20120912" PKG_REV="0" -PKG_ARCH="i386 x86_64" +PKG_ARCH="i386 x86_64 arm" PKG_LICENSE="nonfree" PKG_SITE="http://support.sundtek.com/" PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}-${ARCH}.tar.gz" diff --git a/packages/addons/driver/sundtek-mediatv/changelog.txt b/packages/addons/driver/sundtek-mediatv/changelog.txt index 0c91ec296e..c3d9eaa4a5 100644 --- a/packages/addons/driver/sundtek-mediatv/changelog.txt +++ b/packages/addons/driver/sundtek-mediatv/changelog.txt @@ -1,3 +1,6 @@ +2.1.4 + support for Raspberry Pi + 2.1.3 support for network tuner diff --git a/packages/addons/driver/sundtek-mediatv/meta b/packages/addons/driver/sundtek-mediatv/meta index ad031268ee..aef437fb5c 100644 --- a/packages/addons/driver/sundtek-mediatv/meta +++ b/packages/addons/driver/sundtek-mediatv/meta @@ -20,7 +20,7 @@ PKG_NAME="sundtek-mediatv" PKG_VERSION="2.0" -PKG_REV="3" +PKG_REV="4" PKG_ARCH="any" PKG_LICENSE="nonfree" PKG_SITE="http://support.sundtek.com/" diff --git a/packages/mediacenter/xbmc-frodo/init.d/93_xbmc b/packages/mediacenter/xbmc-frodo/init.d/93_xbmc index 6fb03041e9..d33fb5ff40 100644 --- a/packages/mediacenter/xbmc-frodo/init.d/93_xbmc +++ b/packages/mediacenter/xbmc-frodo/init.d/93_xbmc @@ -36,16 +36,6 @@ fi # hack: make addon-bins executable chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1 -# hack to support user installed fonts - SUBFONTS="/storage/.xbmc/userdata/fonts" - if [ -d "$SUBFONTS" ]; then - files=$(ls $SUBFONTS/*.[tT][tT][fF] 2>/dev/null | wc -l) - if [ "$files" = "0" ]; then - cp /usr/share/xbmc/media/Fonts/*.[tT][tT][fF] $SUBFONTS/ - fi - mount --bind $SUBFONTS /usr/share/xbmc/media/Fonts/ - fi - # starting autostart script (will be removed later again, dont use it!!!) AUTOSTART="/storage/.config/autostart.sh" if [ -f $AUTOSTART ]; then diff --git a/packages/mediacenter/xbmc-frodo/install b/packages/mediacenter/xbmc-frodo/install index d17d97fccb..90983e8427 100755 --- a/packages/mediacenter/xbmc-frodo/install +++ b/packages/mediacenter/xbmc-frodo/install @@ -46,7 +46,7 @@ cd $PKG_BUILD find addons language media sounds userdata system \ -regextype posix-extended -type f \ - -not -iregex ".*-linux.*|.*-arm.*|.*\.vis|.*\.xbs|.*svn.*|.*\.orig|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" \ + -not -iregex ".*-linux.*|.*-arm.*|.*\.vis|.*\.xbs|.*svn.*|.*\.orig|.*\.so|.*\.dll|.*\.pyd|.*python|.*\.zlib|.*\.conf" \ -exec install -D -m 0644 "{}" $ROOT/$INSTALL/usr/share/xbmc/"{}" ";" cd - diff --git a/packages/mediacenter/xbmc-rpi/init.d/93_xbmc b/packages/mediacenter/xbmc-rpi/init.d/93_xbmc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mediacenter/xbmc-rpi/install b/packages/mediacenter/xbmc-rpi/install new file mode 100755 index 0000000000..e69de29bb2 diff --git a/packages/mediacenter/xbmc/init.d/93_xbmc b/packages/mediacenter/xbmc/init.d/93_xbmc index 6fb03041e9..d33fb5ff40 100644 --- a/packages/mediacenter/xbmc/init.d/93_xbmc +++ b/packages/mediacenter/xbmc/init.d/93_xbmc @@ -36,16 +36,6 @@ fi # hack: make addon-bins executable chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1 -# hack to support user installed fonts - SUBFONTS="/storage/.xbmc/userdata/fonts" - if [ -d "$SUBFONTS" ]; then - files=$(ls $SUBFONTS/*.[tT][tT][fF] 2>/dev/null | wc -l) - if [ "$files" = "0" ]; then - cp /usr/share/xbmc/media/Fonts/*.[tT][tT][fF] $SUBFONTS/ - fi - mount --bind $SUBFONTS /usr/share/xbmc/media/Fonts/ - fi - # starting autostart script (will be removed later again, dont use it!!!) AUTOSTART="/storage/.config/autostart.sh" if [ -f $AUTOSTART ]; then diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install index 9f7e80a580..e621426347 100755 --- a/packages/mediacenter/xbmc/install +++ b/packages/mediacenter/xbmc/install @@ -46,7 +46,7 @@ cd $PKG_BUILD find addons language media sounds userdata system \ -regextype posix-extended -type f \ - -not -iregex ".*-linux.*|.*\.vis|.*\.xbs|.*svn.*|.*\.orig|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" \ + -not -iregex ".*-linux.*|.*\.vis|.*\.xbs|.*svn.*|.*\.orig|.*\.so|.*\.dll|.*\.pyd|.*python|.*\.zlib|.*\.conf" \ -exec install -D -m 0644 "{}" $ROOT/$INSTALL/usr/share/xbmc/"{}" ";" cd - diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network index b3daccd5be..f246e474ef 100644 --- a/packages/network/connman/init.d/21_network +++ b/packages/network/connman/init.d/21_network @@ -123,9 +123,9 @@ set_ip_address() { [ -n "$NET_NAMESERVER" ] && echo "Nameservers=$NET_NAMESERVER" >> $CONNMAN_PROFILE ( - local log_file="/tmp/${PROFILE_NAME}.log" + local log_file="/var/log/${PROFILE_NAME}.log" - for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40; do + for i in $(seq 1 60); do echo "--- $i $PROFILE_NAME ------------" >>$log_file 2>&1 dbus-send --system --dest=net.connman --print-reply /net/connman/service/${PROFILE_NAME} net.connman.Service.Connect >>$log_file 2>&1 usleep 500000 @@ -146,7 +146,7 @@ set_ip_address() { set_wired_interface() { local NET_MAC="" - for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do + for i in $(seq 1 30); do if [ ! -f /sys/class/net/$NET_IFACE/address ]; then logger -t Connman "### [$i] cannot find /sys/class/net/$NET_IFACE/address ###" usleep 500000 @@ -183,7 +183,7 @@ set_wireless_interface() { local NET_SSID_HEX=`echo -n "$NET_SSID" | od -tx1 | cut -c8-| tr -d ' \n'` local NET_MAC="" - for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30; do + for i in $(seq 1 120); do if [ ! -f /sys/class/net/$NET_IFACE/address ]; then logger -t Connman "### [$i] cannot find /sys/class/net/$NET_IFACE/address ###" usleep 500000 diff --git a/packages/sysutils/busybox/config/busybox.conf b/packages/sysutils/busybox/config/busybox.conf index 3490227cb3..dba8cd4c9f 100644 --- a/packages/sysutils/busybox/config/busybox.conf +++ b/packages/sysutils/busybox/config/busybox.conf @@ -259,7 +259,7 @@ CONFIG_REALPATH=y CONFIG_RM=y CONFIG_RMDIR=y CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y -# CONFIG_SEQ is not set +CONFIG_SEQ=y # CONFIG_SHA1SUM is not set # CONFIG_SHA256SUM is not set # CONFIG_SHA512SUM is not set diff --git a/packages/x11/other/fontconfig/init.d/35_fontconfig b/packages/x11/other/fontconfig/init.d/35_fontconfig new file mode 100644 index 0000000000..639deeda32 --- /dev/null +++ b/packages/x11/other/fontconfig/init.d/35_fontconfig @@ -0,0 +1,43 @@ +################################################################################ +# Copyright (C) 2009-2010 OpenELEC.tv +# http://www.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 Avahi Daemon +# +# runlevels: openelec, textmode + + +FC_CACHE_DIRS="/usr/share/fonts/ /usr/share/xbmc/media/Fonts/" + +# hack to support user installed fonts + SUBFONTS="/storage/.xbmc/userdata/fonts" + if [ -d "$SUBFONTS" ]; then + files=$(ls $SUBFONTS/*.[tT][tT][fF] 2>/dev/null | wc -l) + if [ "$files" = "0" ]; then + cp /usr/share/xbmc/media/Fonts/*.[tT][tT][fF] $SUBFONTS/ + fi + mount --bind $SUBFONTS /usr/share/xbmc/media/Fonts/ + fi + + +( + progress "Creating fontconfig cache" + fc-cache $FC_CACHE_DIRS +)& + diff --git a/tools/mkpkg/mkpkg_sundtek b/tools/mkpkg/mkpkg_sundtek index d8ed84fb87..a5fc767dd9 100755 --- a/tools/mkpkg/mkpkg_sundtek +++ b/tools/mkpkg/mkpkg_sundtek @@ -45,3 +45,15 @@ chmod 755 $sundtek_base/opt/bin/* echo "packing..." tar czf $sundtek_base-x86_64.tar.gz $sundtek_base rm -fr $sundtek_base + +echo "getting armsysvhf driver..." +wget --passive-ftp --no-check-certificate -O installer.tar.gz http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz +echo "unpacking..." +mkdir -p $sundtek_base +tar xzf installer.tar.gz -C $sundtek_base +rm -f installer.tar.gz +chmod 755 $sundtek_base/opt/bin/* +echo "packing..." +tar czf $sundtek_base-arm.tar.gz $sundtek_base +rm -fr $sundtek_base +