mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-31 14:37:59 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next
This commit is contained in:
Stephan Raue
commit
cbe8c6c2d1
@ -13,6 +13,18 @@
|
||||
<setting id="NET_PREFIXLEN" value="24" />
|
||||
<setting id="NET_SECURITY" value="NONE" />
|
||||
<setting id="NET_SSID" value="" />
|
||||
<setting id="NET2_DNS1" value="" />
|
||||
<setting id="NET2_DNS2" value="" />
|
||||
<setting id="NET2_DNS3" value="" />
|
||||
<setting id="NET2_GATEWAY" value="" />
|
||||
<setting id="NET2_HIDDEN" value="false" />
|
||||
<setting id="NET2_IFACE" value="eth1" />
|
||||
<setting id="NET2_IPADDRESS" value="" />
|
||||
<setting id="NET2_NETWORK" value="NONE" />
|
||||
<setting id="NET2_PASSPHRASE" value="" />
|
||||
<setting id="NET2_PREFIXLEN" value="24" />
|
||||
<setting id="NET2_SECURITY" value="NONE" />
|
||||
<setting id="NET2_SSID" value="" />
|
||||
<setting id="SABNZBD_START" value="false" />
|
||||
<setting id="SAMBA_START" value="true" />
|
||||
<setting id="TRANSMISSION_AUTH" value="false" />
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<addon id="os.openelec.settings"
|
||||
name="OpenELEC OS Settings"
|
||||
version="0.0.9"
|
||||
version="0.0.12"
|
||||
provider-name="openelec.tv">
|
||||
<requires>
|
||||
<import addon="os.openelec.tv" version="@OS_VERSION@"/>
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
|
||||
<!-- Netwerk -->
|
||||
<string id="2100">Netwerk</string>
|
||||
<string id="2101">Netwerk 2</string>
|
||||
<string id="2110">Standaard instellingen</string>
|
||||
<string id="2111">Netwerknaam</string>
|
||||
<string id="2120">Netwerk apparaat</string>
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
|
||||
<!-- Network -->
|
||||
<string id="2100">Network</string>
|
||||
<string id="2101">Network 2</string>
|
||||
<string id="2110">General</string>
|
||||
<string id="2111">Hostname</string>
|
||||
<string id="2120">Network Adapter</string>
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
|
||||
<!-- Network -->
|
||||
<string id="2100">Réseau</string>
|
||||
<string id="2101">Réseau 2</string>
|
||||
<string id="2110">Général</string>
|
||||
<string id="2111">Nom d'hote</string>
|
||||
<string id="2120">Réseau</string>
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
|
||||
<!-- Network -->
|
||||
<string id="2100">Netzwerk</string>
|
||||
<string id="2101">Netzwerk 2</string>
|
||||
<string id="2110">Allgemein</string>
|
||||
<string id="2111">Gerätename</string>
|
||||
<string id="2120">Netzwerk Adapter</string>
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
|
||||
<!-- Nettverk -->
|
||||
<string id="2100">Nettverk</string>
|
||||
<string id="2101">Nettverk 2</string>
|
||||
<string id="2110">Generelt</string>
|
||||
<string id="2111">Vertsnavn</string>
|
||||
<string id="2120">Nettverkskort</string>
|
||||
|
||||
@ -34,15 +34,37 @@
|
||||
<setting id="NET_PREFIXLEN" type="labelenum" label="2132" values="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|31|32" sort="yes" default="24"/>
|
||||
<setting id="NET_GATEWAY" type="ipaddress" label="2133" default=""/>
|
||||
<setting id="NET_DNS1" type="ipaddress" label="2134" default=""/>
|
||||
<setting id="NET_DNS2" type="ipaddress" label="2135" default=""/>
|
||||
<setting id="NET_DNS3" type="ipaddress" label="2136" default=""/>
|
||||
<setting id="NET_DNS2" type="ipaddress" label="2135" default="" enable="!eq(-1,)"/>
|
||||
<setting id="NET_DNS3" type="ipaddress" label="2136" default="" enable="!eq(-1,)"/>
|
||||
<setting label="2150" type="lsep"/>
|
||||
<setting type="sep" />
|
||||
<setting id="NET_SSID" type="text" label="2151" default=""/>
|
||||
<!-- <setting id="NET_HIDDEN" type="bool" label="2152" default="false" /> -->
|
||||
<setting id="NET_SECURITY" type="labelenum" label="2153" values="NONE|WPA/WPA2|WEP" sort="yes" default="NONE" />
|
||||
<setting id="NET_SECURITY" type="labelenum" label="2153" values="NONE|WPA/WPA2|WEP" sort="yes" default="NONE" enable="!eq(-1,)"/>
|
||||
<setting id="NET_PASSPHRASE" type="text" option="hidden" label="2154" default="" enable="!eq(-1,0)"/>
|
||||
</category>
|
||||
</category>
|
||||
|
||||
<!-- Network 2 -->
|
||||
<category label="2101">
|
||||
<setting label="2120" type="lsep"/>
|
||||
<setting type="sep" />
|
||||
<setting id="NET2_NETWORK" type="labelenum" label="2121" values="NONE|LAN|WLAN" sort="yes" default="NONE" />
|
||||
<setting id="NET2_IFACE" type="labelenum" label="2122" values="eth0|eth1|wlan0|wlan1" sort="yes" default="eth1" enable="!eq(-1,1)"/>
|
||||
<setting label="2130" type="lsep"/>
|
||||
<setting type="sep" />
|
||||
<setting id="NET2_IPADDRESS" type="ipaddress" label="2131" default="" enable="!eq(-4,1)"/>
|
||||
<setting id="NET2_PREFIXLEN" type="labelenum" label="2132" values="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|31|32" sort="yes" default="24" enable="!eq(-5,1)"/>
|
||||
<setting id="NET2_GATEWAY" type="ipaddress" label="2133" default="" enable="!eq(-6,1)"/>
|
||||
<setting id="NET2_DNS1" type="ipaddress" label="2134" default="" enable="!eq(-7,1)"/>
|
||||
<setting id="NET2_DNS2" type="ipaddress" label="2135" default="" enable="!eq(-1,)"/>
|
||||
<setting id="NET2_DNS3" type="ipaddress" label="2136" default="" enable="!eq(-1,)"/>
|
||||
<setting label="2150" type="lsep"/>
|
||||
<setting type="sep" />
|
||||
<setting id="NET2_SSID" type="text" label="2151" default="" enable="!eq(-12,1)"/>
|
||||
<!-- <setting id="NET2_HIDDEN" type="bool" label="2152" default="false" /> -->
|
||||
<setting id="NET2_SECURITY" type="labelenum" label="2153" values="NONE|WPA/WPA2|WEP" sort="yes" default="NONE" enable="!eq(-1,)"/>
|
||||
<setting id="NET2_PASSPHRASE" type="text" option="hidden" label="2154" default="" enable="!eq(-1,0)"/>
|
||||
</category>
|
||||
|
||||
<!-- SAMBA -->
|
||||
<category label="5000">
|
||||
|
||||
@ -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
|
||||
)&
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="connman"
|
||||
PKG_VERSION="0.74"
|
||||
PKG_VERSION="0.76"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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
|
||||
)&
|
||||
@ -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
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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 <linux/pci.h>
|
||||
#include <linux/version.h>
|
||||
#include <linux/sched.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
|
||||
#include <linux/smp_lock.h> /* For (un)lock_kernel */
|
||||
+#endif
|
||||
#include <linux/mm.h>
|
||||
#include <linux/pagemap.h>
|
||||
#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 <linux/pci.h>
|
||||
#include <linux/wait.h>
|
||||
#include <linux/miscdevice.h>
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,39)
|
||||
#include <linux/smp_lock.h>
|
||||
+#endif
|
||||
// newer SuSE kernels need this
|
||||
#include <linux/highmem.h>
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
Loading…
x
Reference in New Issue
Block a user