Merge branch 'openelec-next' of github.com:OpenELEC/OpenELEC.tv

Conflicts:
	CHANGELOG
This commit is contained in:
Stephan Raue 2011-10-22 02:16:16 +02:00
commit 6dc7e79f4a
3 changed files with 2 additions and 19 deletions

View File

@ -14,3 +14,4 @@ Added functions:
Removed functions: Removed functions:
- remove netmount.conf (XBMC includes native NFS/AFP/CIFS/SSH support) - remove netmount.conf (XBMC includes native NFS/AFP/CIFS/SSH support)

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="dvb-firmware" PKG_NAME="dvb-firmware"
PKG_VERSION="0.0.14" PKG_VERSION="0.0.15"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="Free-to-use" PKG_LICENSE="Free-to-use"

View File

@ -1,18 +0,0 @@
diff -Naur wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service wpa_supplicant-0.7.3.patch/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service 2010-09-07 17:43:39.000000000 +0200
+++ wpa_supplicant-0.7.3.patch/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service 2011-04-08 19:04:10.740611827 +0200
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=fi.epitest.hostap.WPASupplicant
-Exec=/sbin/wpa_supplicant -u
+Exec=/sbin/wpa_supplicant -u -dd -t -f /var/log/wpa_supplicant.log
User=root
diff -Naur wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service wpa_supplicant-0.7.3.patch/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service 2010-09-07 17:43:39.000000000 +0200
+++ wpa_supplicant-0.7.3.patch/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service 2011-04-08 19:04:18.365451110 +0200
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=fi.w1.wpa_supplicant1
-Exec=/sbin/wpa_supplicant -u
+Exec=/sbin/wpa_supplicant -u -dd -t -f /var/log/wpa_supplicant.log
User=root