From 3de58c7ff8da63f3879770537498bdb8aaaa2754 Mon Sep 17 00:00:00 2001 From: therio Date: Sun, 23 Jan 2011 15:04:40 -0800 Subject: [PATCH 01/11] --- .../source/resources/language/Dutch/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 997d2bc294..7234968bac 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 @@ -15,11 +15,11 @@ Netwerk apparaat of MAC adres IP instelling Statisch IP adres - Netmask Prefixlength + Netwerkprefix lengte Netwerk gateway - DNS servers 1 - DNS servers 2 - DNS servers 3 + DNS server 1 + DNS server 2 + DNS server 3 WLAN Instellingen WLAN SSID (router naam) WLAN beveiliging From 8b30fa36b259a2453e28da49d1441cf49800684e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 24 Jan 2011 14:03:13 +0100 Subject: [PATCH 02/11] create_installstick.bat: use temporary LABEL support again Signed-off-by: Stephan Raue --- config/release/create_installstick.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/release/create_installstick.bat b/config/release/create_installstick.bat index 4198fbe4f3..d5589d269b 100644 --- a/config/release/create_installstick.bat +++ b/config/release/create_installstick.bat @@ -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 From 318f170f67cd968626a33787f95d9b4fe7dd2be9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 25 Jan 2011 01:12:56 +0100 Subject: [PATCH 03/11] netmount: dont exit our init if mount fails Signed-off-by: Stephan Raue --- packages/network/netmount/init.d/59_netmount | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/network/netmount/init.d/59_netmount b/packages/network/netmount/init.d/59_netmount index 483e4d90fd..1e6c9beaad 100644 --- a/packages/network/netmount/init.d/59_netmount +++ b/packages/network/netmount/init.d/59_netmount @@ -40,10 +40,10 @@ IFS=" mkdir -p $MOUNTPOINT case "$SERVICE" in cifs|smb|samba) - mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1 + mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1 || true ;; nfs) - mount.nfs "$SHARE" "$MOUNTPOINT" > /dev/null 2>&1 + mount.nfs "$SHARE" "$MOUNTPOINT" > /dev/null 2>&1 || true ;; esac done From 7548320f8e7592e09f3e7e1193b2e61f4ef9fa98 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 25 Jan 2011 01:18:47 +0100 Subject: [PATCH 04/11] xbmc-addon-settings: update french language file, thanks to Stombi Signed-off-by: Stephan Raue --- .../source/resources/language/French/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 016923872c..a7979e0352 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 @@ -33,7 +33,7 @@ TV/PVR Démarrage - Lancer le serveur TV Server au démarrage + Lancer le serveur TV au démarrage Samba From 86145101f0343b389f5c74261941d9fe17dd0cff Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 25 Jan 2011 02:19:43 +0100 Subject: [PATCH 05/11] connman: add support for hidden networks Signed-off-by: Stephan Raue --- packages/network/connman/init.d/21_network | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network index 4cc1aa96f6..a9b15c5050 100644 --- a/packages/network/connman/init.d/21_network +++ b/packages/network/connman/init.d/21_network @@ -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 From 128171818c988af7f0f30ce25c7519197dae4ec7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 25 Jan 2011 02:20:06 +0100 Subject: [PATCH 06/11] xbmc-addon-settings: add support for hidden networks Signed-off-by: Stephan Raue --- .../xbmc-addon-settings/config/default_settings.xml | 1 + packages/mediacenter/xbmc-addon-settings/source/addon.xml | 2 +- packages/mediacenter/xbmc-addon-settings/source/default.py | 2 +- .../source/resources/language/Dutch/strings.xml | 5 +++-- .../source/resources/language/English/strings.xml | 5 +++-- .../source/resources/language/French/strings.xml | 5 +++-- .../xbmc-addon-settings/source/resources/settings.xml | 5 +++-- 7 files changed, 15 insertions(+), 10 deletions(-) diff --git a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml index 3a434413f6..375c283f76 100644 --- a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml @@ -4,6 +4,7 @@ + diff --git a/packages/mediacenter/xbmc-addon-settings/source/addon.xml b/packages/mediacenter/xbmc-addon-settings/source/addon.xml index c37017605e..76453efdaf 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/default.py b/packages/mediacenter/xbmc-addon-settings/source/default.py index cca3ad5bc8..547ddba574 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/default.py +++ b/packages/mediacenter/xbmc-addon-settings/source/default.py @@ -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') 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 7234968bac..cf51531315 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 @@ -22,8 +22,9 @@ DNS server 3 WLAN Instellingen WLAN SSID (router naam) - WLAN beveiliging - WLAN wachtwoord + Verborgen netwerk + WLAN beveiliging + WLAN wachtwoord LCD/VFD 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 25f8faf1bc..5137a33f67 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 @@ -22,8 +22,9 @@ DNS server 3 WLAN settings WLAN SSID - WLAN Security - WLAN Passphrase + Hidden Network + WLAN Security + WLAN Passphrase LCD/VFD 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 a7979e0352..d65cba4a11 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 @@ -22,8 +22,9 @@ Serveurs DNS 3 Paramètres WIFI SSID - Sécurité WIFI - Passphrase + Réseau masqué + Sécurité WIFI + Passphrase LCD/VFD diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml index f20988c06c..e53b26a52f 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml @@ -28,8 +28,9 @@ - - + + + From cbcce84a6660a03d798972254265e83e246ac2f3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 25 Jan 2011 14:56:01 +0100 Subject: [PATCH 07/11] netmount: seperate netmount script Signed-off-by: Stephan Raue --- packages/network/netmount/init.d/59_netmount | 26 +--------- packages/network/netmount/install | 3 ++ packages/network/netmount/scripts/netmount | 51 ++++++++++++++++++++ 3 files changed, 56 insertions(+), 24 deletions(-) create mode 100755 packages/network/netmount/scripts/netmount diff --git a/packages/network/netmount/init.d/59_netmount b/packages/network/netmount/init.d/59_netmount index 1e6c9beaad..f35f58c0d0 100644 --- a/packages/network/netmount/init.d/59_netmount +++ b/packages/network/netmount/init.d/59_netmount @@ -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 || true - ;; - nfs) - mount.nfs "$SHARE" "$MOUNTPOINT" > /dev/null 2>&1 || true - ;; - esac - done -fi +progress "mounting Network shares" + netmount diff --git a/packages/network/netmount/install b/packages/network/netmount/install index 70d9667db0..87546cd92a 100755 --- a/packages/network/netmount/install +++ b/packages/network/netmount/install @@ -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 diff --git a/packages/network/netmount/scripts/netmount b/packages/network/netmount/scripts/netmount new file mode 100755 index 0000000000..38730eca3b --- /dev/null +++ b/packages/network/netmount/scripts/netmount @@ -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 From 57636afa7fb7f6c26fa02134209c3d619b5bc2f5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 26 Jan 2011 20:32:06 +0100 Subject: [PATCH 08/11] tools: cosmetics Signed-off-by: Stephan Raue --- packages/tools/meta | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/tools/meta b/packages/tools/meta index d17d859117..7a00cb0232 100644 --- a/packages/tools/meta +++ b/packages/tools/meta @@ -34,6 +34,3 @@ PKG_LONGDESC="debug is a Metapackage for installing some tools" PKG_IS_ADDON="no" PKG_AUTORECONF="no" - - - From 2e554e2788adbfea2af8068fcc7e768ecf5f9702 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 26 Jan 2011 20:32:41 +0100 Subject: [PATCH 09/11] hdparm: update to hdparm-9.37 Signed-off-by: Stephan Raue --- packages/tools/hdparm/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/hdparm/meta b/packages/tools/hdparm/meta index 2dbe9f6292..8a33bac034 100644 --- a/packages/tools/hdparm/meta +++ b/packages/tools/hdparm/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="hdparm" -PKG_VERSION="9.36" +PKG_VERSION="9.37" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="BSD" From 97b9091ac38c9fd4ce038b9081a5079993b0d081 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 26 Jan 2011 20:33:16 +0100 Subject: [PATCH 10/11] libXi: update to libXi-1.4.1 Signed-off-by: Stephan Raue --- packages/x11/lib/libXi/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/lib/libXi/meta b/packages/x11/lib/libXi/meta index bb0ef388aa..20bf5c8194 100644 --- a/packages/x11/lib/libXi/meta +++ b/packages/x11/lib/libXi/meta @@ -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" From cdd0f1dbeb820dda19511a4d01aec8101f82f344 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 26 Jan 2011 20:33:53 +0100 Subject: [PATCH 11/11] v4l-utils: update to v4l-utils-0.8.2 Signed-off-by: Stephan Raue --- packages/sysutils/v4l-utils/meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/v4l-utils/meta b/packages/sysutils/v4l-utils/meta index 272dad27ba..0e05a0c85e 100644 --- a/packages/sysutils/v4l-utils/meta +++ b/packages/sysutils/v4l-utils/meta @@ -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"