jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-30 06:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into openelec-pvr

Browse Source
This commit is contained in:
Gujs 2011-01-26 21:37:45 +01:00
commit c05616ceb0
16 changed files with 88 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/release/create_installstick.bat
View File

@ -91,7 +91,7 @@ echo PROMPT 0 >> %DRIVE%\syslinux.cfg
echo. >> %DRIVE%\syslinux.cfg
echo LABEL linux >> %DRIVE%\syslinux.cfg
echo KERNEL /KERNEL >> %DRIVE%\syslinux.cfg
echo APPEND boot=UUID=%DRIVEUUID% installer quiet >> %DRIVE%\syslinux.cfg
echo APPEND boot=LABEL=OPENELEC installer quiet >> %DRIVE%\syslinux.cfg
GOTO END
:BADMD5

1
packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
View File

@ -4,6 +4,7 @@
<setting id="NET_DNS2" value="" />
<setting id="NET_DNS3" value="" />
<setting id="NET_GATEWAY" value="" />
<setting id="NET_HIDDEN" value="false" />
<setting id="NET_HOSTNAME" value="openelec" />
<setting id="NET_IFACE" value="eth0" />
<setting id="NET_IPADDRESS" value="" />

2
packages/mediacenter/xbmc-addon-settings/source/addon.xml
View File

@ -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.2"
version="0.0.3"
provider-name="openelec.tv">
<requires>
<import addon="os.openelec.tv" version="@OS_VERSION@"/>

2
packages/mediacenter/xbmc-addon-settings/source/default.py
View File

@ -27,7 +27,7 @@ __author__ = "OpenELEC"
__url__ = "http://www.openelec.tv"
__svn_url__ = ""
__credits__ = ""
__version__ = "0.0.2"
__version__ = "0.0.3"
__XBMC_Revision__ = "22240"
__settings__ = xbmcaddon.Addon(id='os.openelec.settings')

13
packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
View File

@ -15,15 +15,16 @@
<string id="2122">Netwerk apparaat of MAC adres</string>
<string id="2130">IP instelling</string>
<string id="2131">Statisch IP adres</string>
<string id="2132">Netmask Prefixlength</string>
<string id="2132">Netwerkprefix lengte</string>
<string id="2133">Netwerk gateway</string>
<string id="2134">DNS servers 1</string>
<string id="2135">DNS servers 2</string>
<string id="2136">DNS servers 3</string>
<string id="2134">DNS server 1</string>
<string id="2135">DNS server 2</string>
<string id="2136">DNS server 3</string>
<string id="2150">WLAN Instellingen</string>
<string id="2151">WLAN SSID (router naam)</string>
<string id="2152">WLAN beveiliging</string>
<string id="2153">WLAN wachtwoord</string>
<string id="2152">Verborgen netwerk</string>
<string id="2153">WLAN beveiliging</string>
<string id="2154">WLAN wachtwoord</string>
<!-- LCD -->
<string id="3100">LCD/VFD</string>

5
packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
View File

@ -22,8 +22,9 @@
<string id="2136">DNS server 3</string>
<string id="2150">WLAN settings</string>
<string id="2151">WLAN SSID</string>
<string id="2152">WLAN Security</string>
<string id="2153">WLAN Passphrase</string>
<string id="2152">Hidden Network</string>
<string id="2153">WLAN Security</string>
<string id="2154">WLAN Passphrase</string>
<!-- LCD -->
<string id="3100">LCD/VFD</string>

7
packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
View File

@ -22,8 +22,9 @@
<string id="2136">Serveurs DNS 3</string>
<string id="2150">Paramètres WIFI</string>
<string id="2151">SSID</string>
<string id="2152">Sécurité WIFI</string>
<string id="2153">Passphrase</string>
<string id="2152">Réseau masqué</string>
<string id="2153">Sécurité WIFI</string>
<string id="2154">Passphrase</string>
<!-- LCD -->
<string id="3100">LCD/VFD</string>
@ -33,7 +34,7 @@
<!-- TV_SERVER -->
<string id="4100">TV/PVR</string>
<string id="4110">Démarrage</string>
<string id="4111">Lancer le serveur TV Server au démarrage</string>
<string id="4111">Lancer le serveur TV au démarrage</string>
<!-- SAMBA -->
<string id="5000">Samba</string>

5
packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
View File

@ -28,8 +28,9 @@
<setting label="2150" type="lsep"/>
<setting type="sep" />
<setting id="NET_SSID" type="text" label="2151" default=""/>
<setting id="NET_SECURITY" type="labelenum" label="2152" values="NONE|PSK|WEP" sort="yes" default="NONE" />
<setting id="NET_PASSPHRASE" type="text" option="hidden" label="2153" default="" enable="!eq(-1,0)"/>
<setting id="NET_HIDDEN" type="bool" label="2152" default="false" />
<setting id="NET_SECURITY" type="labelenum" label="2153" values="NONE|PSK|WEP" sort="yes" default="NONE" />
<setting id="NET_PASSPHRASE" type="text" option="hidden" label="2154" default="" enable="!eq(-1,0)"/>
</category>
<!-- LCD -->

8
packages/network/connman/init.d/21_network
View File

@ -34,6 +34,7 @@ if [ -f "$OPENELEC_SETTINGS" ]; then
DNS1=`grep NET_DNS1 $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
DNS2=`grep NET_DNS2 $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
DNS3=`grep NET_DNS3 $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
HIDDEN=`grep NET_HIDDEN $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
SSID=`grep NET_SSID $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
SECURITY=`grep NET_SECURITY $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
PASSPHRASE=`grep NET_PASSPHRASE $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
@ -79,7 +80,12 @@ fi
MODE="managed_none"
fi
echo "[wifi_${IFACE}_${SSID_HEX}_${MODE}]" > $CONNMAN_PROFILE
if [ "$HIDDEN" = "true" ]; then
echo "[wifi_${IFACE}_hidden_${MODE}]" > $CONNMAN_PROFILE
else
echo "[wifi_${IFACE}_${SSID_HEX}_${MODE}]" > $CONNMAN_PROFILE
fi
echo "Name=$SSID" >> $CONNMAN_PROFILE
echo "SSID=$SSID_HEX" >> $CONNMAN_PROFILE
[ -n "$PASSPHRASE" ] && echo "Passphrase=$PASSPHRASE" >> $CONNMAN_PROFILE

26
packages/network/netmount/init.d/59_netmount
View File

@ -22,29 +22,7 @@
#
# runlevels: openelec, textmode
NETMOUNT_USERCONF="/storage/.config/netmount.conf"
if [ -f $NETMOUNT_USERCONF ]; then
wait_for_network
IFS="
"
for i in `cat $NETMOUNT_USERCONF |grep -v "^#"`; do
SERVICE=`echo $i | awk -F\| '{print $1}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
SHARE=`echo $i | awk -F\| '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
MOUNTPOINT=`echo $i | awk -F\| '{print $3}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
OPTIONS=`echo $i | awk -F\| '{print $4}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
progress "... mounting $SHARE to $MOUNTPOINT via $SERVICE ..."
mkdir -p $MOUNTPOINT
case "$SERVICE" in
cifs|smb|samba)
mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1
;;
nfs)
mount.nfs "$SHARE" "$MOUNTPOINT" > /dev/null 2>&1
;;
esac
done
fi
progress "mounting Network shares"
netmount

3
packages/network/netmount/install
View File

@ -22,5 +22,8 @@
. config/options $1
mkdir -p $INSTALL/usr/bin
cp $PKG_DIR/scripts/netmount $INSTALL/usr/bin
mkdir -p $INSTALL/usr/config
cp $PKG_DIR/config/netmount.conf.sample $INSTALL/usr/config

51
packages/network/netmount/scripts/netmount Executable file
View File

@ -0,0 +1,51 @@
#!/bin/sh
################################################################################
# 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, 675 Mass Ave, Cambridge, MA 02139, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
# Mounting Network shares
NETMOUNT_USERCONF="/storage/.config/netmount.conf"
if [ -f "$NETMOUNT_USERCONF" ]; then
IFS="
"
for i in `cat $NETMOUNT_USERCONF |grep -v "^#"`; do
SERVICE=`echo $i | awk -F\| '{print $1}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
SHARE=`echo $i | awk -F\| '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
MOUNTPOINT=`echo $i | awk -F\| '{print $3}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
OPTIONS=`echo $i | awk -F\| '{print $4}' | sed 's/^[ \t]*//;s/[ \t]*$//'`
logger -t Netmount "... mounting $SHARE to $MOUNTPOINT via $SERVICE ..."
mkdir -p $MOUNTPOINT
case "$SERVICE" in
cifs)
mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1
;;
nfs)
mount.nfs "$SHARE" "$MOUNTPOINT" > /dev/null 2>&1
;;
esac
done
fi
exit 0

4
packages/sysutils/v4l-utils/meta
View File

@ -19,12 +19,12 @@
################################################################################
PKG_NAME="v4l-utils"
PKG_VERSION="20110107"
PKG_VERSION="0.8.2"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://linuxtv.org/"
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="http://linuxtv.org/downloads/v4l-utils//$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"

2
packages/tools/hdparm/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="hdparm"
PKG_VERSION="9.36"
PKG_VERSION="9.37"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"

3
packages/tools/meta
View File

@ -34,6 +34,3 @@ PKG_LONGDESC="debug is a Metapackage for installing some tools"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"

2
packages/x11/lib/libXi/meta
View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libXi"
PKG_VERSION="1.4.0"
PKG_VERSION="1.4.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"