Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-1.0

packages/linux-firmware/dvb-firmware/meta

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

packages/sysutils/busybox/profile.d/systemid.conf

@@ -0,0 +1,38 @@
+################################################################################
+#      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
+################################################################################
+# Attempts to generate a unique system ID based on one local MAC address
+# SystemID SHOULD be the same between upgrades/reinstalls
+# MAC is hashed so that it cant be reversed making it anonymous
+# Used to help with global usage statistics
+################################################################################
+
+SYSTEMID="00000000000000000000000000000000"
+
+if [ -e "/sys/class/net/eth0/address" ]; then
+  MAC_ADRESS=`cat /sys/class/net/eth0/address`
+elif [ -e "/sys/class/net/wlan0/address" ]; then
+  MAC_ADRESS=`cat /sys/class/net/wlan0/address`
+fi
+
+if [ -n "$MAC_ADRESS" ]; then
+  SYSTEMID=`/bin/echo $MAC_ADRESS | /usr/bin/md5sum | /usr/bin/cut -f1 -d" "`
+fi
+
+export SYSTEMID

packages/tools/autoupdate/scripts/autoupdate.devel

@@ -43,7 +43,9 @@ fi
 download () {
   case "$DL_METHOD" in
     wget)
-      wget -c $1 -P $TMP_DIR > /dev/null 2>&1
+      wget -U "$THIS_DISTRIBUTION ($THIS_ARCH): $THIS_VERSION" \
+           -c ${1}?sysid=$SYSTEMID \
+           -O $2 > /dev/null 2>&1
       ;;
     scp)
       scp $SCP_ARG "$1" $TMP_DIR
@@ -69,7 +71,7 @@ if [ ! -f /var/lock/update.lock ]; then
 
   # get infofile with the latest released version
     rm -rf $TMP_DIR/latest
-    download "$UPDATEURL/latest"
+    download "$UPDATEURL/latest" "$TMP_DIR/latest"
 
     NEW_IMAGE="`cat $TMP_DIR/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`"
     NEW_VERSION="`echo "$NEW_IMAGE" | cut -d "-" -f5 | tr -d "r"`"
@@ -79,7 +81,7 @@ if [ ! -f /var/lock/update.lock ]; then
   # compare installed version with latest released version
     THIS_VERSION="`echo "$THIS_VERSION" | cut -d "-" -f3 | tr -d "r"`"
 
-    if [ -Z $NEW_VERSION ]; then
+    if [ -z $NEW_VERSION ]; then
       NEW_VERSION="$THIS_VERSION"
     fi
 
@@ -100,7 +102,7 @@ if [ ! -f /var/lock/update.lock ]; then
 
       # downloading the new version
         rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
-        download "$UPDATEURL/$NEW_IMAGE.tar.bz2"
+        download "$UPDATEURL/$NEW_IMAGE.tar.bz2" "$TMP_DIR/$NEW_IMAGE.tar.bz2"
 
       # extract the image
         rm -rf $TMP_DIR/$NEW_IMAGE

packages/tools/autoupdate/scripts/autoupdate.release

@@ -43,7 +43,9 @@ fi
 download () {
   case "$DL_METHOD" in
     wget)
-      wget -c $1 -P $TMP_DIR > /dev/null 2>&1
+      wget -U "$THIS_DISTRIBUTION ($THIS_ARCH): $THIS_VERSION" \
+           -c ${1}?sysid=$SYSTEMID \
+           -O $2 > /dev/null 2>&1
       ;;
     scp)
       scp $SCP_ARG "$1" $TMP_DIR
@@ -72,7 +74,7 @@ if [ ! -f /var/lock/update.lock ]; then
 
   # get infofile with the latest released version
     rm -rf $TMP_DIR/latest
-    download "$UPDATEURL/latest"
+    download "$UPDATEURL/latest" "$TMP_DIR/latest"
 
     NEW_IMAGE="`cat $TMP_DIR/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`"
     NEW_VERSION="`echo "$NEW_IMAGE" | cut -d "-" -f3`"
@@ -116,7 +118,7 @@ if [ ! -f /var/lock/update.lock ]; then
 
     # downloading the new version
       rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
-      download "$UPDATEURL/$NEW_IMAGE.tar.bz2"
+      download "$UPDATEURL/$NEW_IMAGE.tar.bz2" "$TMP_DIR/$NEW_IMAGE.tar.bz2"
 
     # extract the image
       rm -rf $TMP_DIR/$NEW_IMAGE