diff --git a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml index 6c7461fb6f..83873b2a97 100644 --- a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml @@ -13,6 +13,18 @@ + + + + + + + + + + + + diff --git a/packages/mediacenter/xbmc-addon-settings/source/addon.xml b/packages/mediacenter/xbmc-addon-settings/source/addon.xml index d655bcf87e..8125c70016 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/addon.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/addon.xml @@ -1,7 +1,7 @@ diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml index 5e16b5ce7e..ba2c174e5b 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml @@ -16,6 +16,7 @@ Netwerk + Netwerk 2 Standaard instellingen Netwerknaam Netwerk apparaat diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml index 77250dd2a2..0ffa78fb2e 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml @@ -16,6 +16,7 @@ Network + Network 2 General Hostname Network Adapter diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml index 6b09a8f75a..af3ac4da7d 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml @@ -16,6 +16,7 @@ Réseau + Réseau 2 Général Nom d'hote Réseau diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml index c6a80bb80b..3c8d466e51 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml @@ -16,6 +16,7 @@ Netzwerk +Netzwerk 2 Allgemein Gerätename Netzwerk Adapter diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml index d6fedf81ed..6c8c118f44 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml @@ -16,6 +16,7 @@ Nettverk + Nettverk 2 Generelt Vertsnavn Nettverkskort diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml index 9d7e62f467..c53f57a16e 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml @@ -34,15 +34,37 @@ - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network index 89da806004..1e7331e5b9 100644 --- a/packages/network/connman/init.d/21_network +++ b/packages/network/connman/init.d/21_network @@ -24,6 +24,10 @@ if [ -f /var/config/settings.conf ]; then . /var/config/settings.conf + +# save original interface names (eth0, eth1) + NET_IFACE_NAME=$NET_IFACE + NET2_IFACE_NAME=$NET2_IFACE fi [ -z "$NET_HOSTNAME" ] && NET_HOSTNAME="openelec" @@ -40,16 +44,15 @@ fi [ -f $HOME/.config/hosts.conf ] && cat $HOME/.config/hosts.conf >> /etc/hosts ( - # setup Networking - progress "setup Networking" + # setup Networking 1 + progress "setup Networking 1" CONNMAN_PROFILE="/var/lib/connman/default.profile" mkdir -p /var/run/connman mkdir -p /var/lib/connman - # NETWORK: ( LAN / WLAN ) - + # NETWORK 1: ( LAN / WLAN ) for i in 0 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 if [ ! -f /sys/class/net/$NET_IFACE/address ]; then logger -t Connman "### [$i] cannot find /sys/class/net/$NET_IFACE/address ###" @@ -84,7 +87,6 @@ fi [ -n "$NET_PASSPHRASE" ] && echo "Passphrase=$NET_PASSPHRASE" >> $CONNMAN_PROFILE echo "Favorite=true" >> $CONNMAN_PROFILE echo "AutoConnect=true" >> $CONNMAN_PROFILE - else MODE="cable" echo "[ethernet_${NET_IFACE}_${MODE}]" > $CONNMAN_PROFILE @@ -104,12 +106,90 @@ fi [ -n "$NET_DNS3" ] && NET_NAMESERVER="$NET_NAMESERVER;$NET_DNS3" [ -n "$NET_NAMESERVER" ] && echo "Nameservers=$NET_NAMESERVER;" >> $CONNMAN_PROFILE fi + # END OF NETWORK 1 + + # NETWORK 2: ( LAN / WLAN ) + if [ "$NET2_NETWORK" != "NONE" -a "$NET2_IFACE_NAME" != "$NET_IFACE_NAME" ]; then + # setup Networking 2 + progress "setup Networking 2" + + for i in 0 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 + if [ ! -f /sys/class/net/$NET2_IFACE/address ]; then + logger -t Connman "### [$i] cannot find /sys/class/net/$NET2_IFACE/address ###" + else + logger -t Connman "### [$i] found /sys/class/net/$NET2_IFACE/address, continue ###" + NET2_IFACE=`cat /sys/class/net/$NET2_IFACE/address | sed 's/://g'` + break + fi + usleep 500000 + done + + if [ "$NET2_NETWORK" = "WLAN" -a -n "$NET2_SSID" ]; then + NET2_SSID_HEX=`echo -n "$NET2_SSID" | od -tx1 | cut -c8-| tr -d ' \n'` + + # NET_SECURITY: ( NONE / WEP / WPA/WPA2 ) + if [ "$NET2_SECURITY" = "WEP" -a -n "$NET2_PASSPHRASE" ]; then + MODE="managed_wep" + elif [ "$NET2_SECURITY" = "WPA/WPA2" -a -n "$NET2_PASSPHRASE" ]; then + MODE="managed_psk" + else + MODE="managed_none" + fi + + if [ "$NET2_HIDDEN" = "true" ]; then + echo "[wifi_${NET2_IFACE}_hidden_${MODE}]" >> $CONNMAN_PROFILE + else + echo "[wifi_${NET2_IFACE}_${NET2_SSID_HEX}_${MODE}]" >> $CONNMAN_PROFILE + fi + + echo "Name=$NET2_SSID" >> $CONNMAN_PROFILE + echo "SSID=$NET2_SSID_HEX" >> $CONNMAN_PROFILE + [ -n "$NET2_PASSPHRASE" ] && echo "Passphrase=$NET2_PASSPHRASE" >> $CONNMAN_PROFILE + echo "Favorite=true" >> $CONNMAN_PROFILE + echo "AutoConnect=true" >> $CONNMAN_PROFILE + else + MODE="cable" + echo "[ethernet_${NET2_IFACE}_${MODE}]" >> $CONNMAN_PROFILE + fi + + # IP settings + if [ -z "$NET2_IPADDRESS" ]; then + echo "IPv4.method=dhcp" >> $CONNMAN_PROFILE + else + echo "IPv4.method=manual" >> $CONNMAN_PROFILE + echo "IPv4.local_address=$NET2_IPADDRESS" >> $CONNMAN_PROFILE + [ -n "$NET2_PREFIXLEN" ] && echo "IPv4.netmask_prefixlen=$NET2_PREFIXLEN" >> $CONNMAN_PROFILE + [ -n "$NET2_GATEWAY" ] && echo "IPv4.gateway=$NET2_GATEWAY" >> $CONNMAN_PROFILE + + [ -n "$NET2_DNS1" ] && NET2_NAMESERVER="$NET2_DNS1" + [ -n "$NET2_DNS2" ] && NET2_NAMESERVER="$NET2_NAMESERVER;$NET2_DNS2" + [ -n "$NET2_DNS3" ] && NET2_NAMESERVER="$NET2_NAMESERVER;$NET2_DNS3" + [ -n "$NET2_NAMESERVER" ] && echo "Nameservers=$NET2_NAMESERVER;" >> $CONNMAN_PROFILE + fi + +( + # wait some time, put eth1 (NET2_IFACE) down and then up + # this is just temporary solution until I figure out how to + # do properly with connman + usleep 5000000 + ifconfig $NET2_IFACE_NAME down + usleep 1000000 + ifconfig $NET2_IFACE_NAME up +)& + + fi + # END OF NETWORK 2 + + # overwrite created profile with custom one if exist (debug use only) + DEBUG_CONNMAN_PROFILE="/storage/.config/connman.profile" + [ -f "$DEBUG_CONNMAN_PROFILE" ] && cp $DEBUG_CONNMAN_PROFILE $CONNMAN_PROFILE + [ -f "$DEBUG_CONNMAN_PROFILE" ] && mv $DEBUG_CONNMAN_PROFILE ${DEBUG_CONNMAN_PROFILE}_saved # starting Connection manager progress "starting Connection manager" while true; do - /usr/sbin/connmand -n > /dev/null 2>&1 + /usr/sbin/connmand -n usleep 250000 done )& diff --git a/packages/network/connman/meta b/packages/network/connman/meta index f0799057ca..54f75f05b6 100644 --- a/packages/network/connman/meta +++ b/packages/network/connman/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="connman" -PKG_VERSION="0.74" +PKG_VERSION="0.76" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/samba/meta b/packages/network/samba/meta index 825716893b..4106e20bef 100644 --- a/packages/network/samba/meta +++ b/packages/network/samba/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="samba" -PKG_VERSION="3.5.9" +PKG_VERSION="3.5.10" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/samba/patches/samba-3.5.9-010_crosscompile-0.1.patch b/packages/network/samba/patches/samba-3.5.10-010_crosscompile-0.1.patch similarity index 100% rename from packages/network/samba/patches/samba-3.5.9-010_crosscompile-0.1.patch rename to packages/network/samba/patches/samba-3.5.10-010_crosscompile-0.1.patch diff --git a/packages/sysutils/busybox/init.d/55_httpd b/packages/sysutils/busybox/init.d/55_httpd deleted file mode 100644 index 89e5e16d86..0000000000 --- a/packages/sysutils/busybox/init.d/55_httpd +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -# -# start httpd daemon -# -# runlevels: openelec, textmode - -( - progress "Starting HTTP daemon" - httpd -p 80 -)& diff --git a/packages/sysutils/libusb-compat/build b/packages/sysutils/libusb-compat/build index 03cf8eb980..e5818318fa 100755 --- a/packages/sysutils/libusb-compat/build +++ b/packages/sysutils/libusb-compat/build @@ -35,3 +35,8 @@ cd $PKG_BUILD make $MAKEINSTALL + +$SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \ + $SYSROOT_PREFIX/usr/bin/libusb-config + +mv $SYSROOT_PREFIX/usr/bin/libusb-config $ROOT/$TOOLCHAIN/bin diff --git a/packages/x11/driver/xf86-video-fglrx/meta b/packages/x11/driver/xf86-video-fglrx/meta index a0dfa2ecd7..dddf255bf4 100644 --- a/packages/x11/driver/xf86-video-fglrx/meta +++ b/packages/x11/driver/xf86-video-fglrx/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-fglrx" -PKG_VERSION="11.6" +PKG_VERSION="11.7" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="nonfree" diff --git a/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-11.5-001-linux-2.6.39_no_smp_lock.h.patch b/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-11.5-001-linux-2.6.39_no_smp_lock.h.patch deleted file mode 100644 index 8d12681b98..0000000000 --- a/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-11.5-001-linux-2.6.39_no_smp_lock.h.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -Naur xf86-video-fglrx-11.5/common/lib/modules/fglrx/build_mod/drmP.h xf86-video-fglrx-11.5.patch/common/lib/modules/fglrx/build_mod/drmP.h ---- xf86-video-fglrx-11.5/common/lib/modules/fglrx/build_mod/drmP.h 2011-05-03 17:19:14.000000000 +0200 -+++ xf86-video-fglrx-11.5.patch/common/lib/modules/fglrx/build_mod/drmP.h 2011-05-11 17:39:25.549917899 +0200 -@@ -57,7 +57,9 @@ - #include - #include - #include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39) - #include /* For (un)lock_kernel */ -+#endif - #include - #include - #if defined(__alpha__) || defined(__powerpc__) -diff -Naur xf86-video-fglrx-11.5/common/lib/modules/fglrx/build_mod/firegl_public.c xf86-video-fglrx-11.5.patch/common/lib/modules/fglrx/build_mod/firegl_public.c ---- xf86-video-fglrx-11.5/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-05-03 17:19:14.000000000 +0200 -+++ xf86-video-fglrx-11.5.patch/common/lib/modules/fglrx/build_mod/firegl_public.c 2011-05-11 17:52:40.421297182 +0200 -@@ -114,7 +114,9 @@ - #include - #include - #include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39) - #include -+#endif - // newer SuSE kernels need this - #include - -@@ -1049,7 +1051,11 @@ - dev->pubdev.signature = FGL_DEVICE_SIGNATURE; - - for (i = 0; i < __KE_MAX_SPINLOCKS; i++) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39) - dev->spinlock[i] = SPIN_LOCK_UNLOCKED; -+#else -+ dev->spinlock[i] = __SPIN_LOCK_UNLOCKED(old_style_spin_init); -+#endif - - for (i=0; i < __KE_MAX_SEMAPHORES; i++) - sema_init(&dev->struct_sem[i], 1); -@@ -1900,13 +1906,17 @@ - /** \brief Grab global kernel lock */ - void ATI_API_CALL KCL_GlobalKernelLock(void) - { -+#ifdef CONFIG_KERNEL_LOCK - lock_kernel(); -+#endif - } - - /** \brief Release global kernel lock */ - void ATI_API_CALL KCL_GlobalKernelUnlock(void) - { -+#ifdef CONFIG_KERNEL_LOCK - unlock_kernel(); -+#endif - } - - /*****************************************************************************/