Makefile

@@ -161,7 +161,7 @@ fs.cpio: $(CPIO_SRCS)
 	  $(foreach f,$(notdir $(wildcard apps/minisatip8/html/*)), -e "apps/minisatip8/html/$f:usr/share/minisatip8/html/$f") \
 	  -e "apps/$(NANO)/src/nano:usr/bin/nano" \
 	  -e "apps/mtd-utils/nandwrite:usr/sbin/nandwrite2" \
-	  -e "apps/oscam-svn/Distribution/oscam-1.20_svn$(OSCAM_REV)-sh4-linux:sbin/oscamd"
+	  -e "apps/oscam-svn/Distribution/oscam-1.20-unstable_svn$(OSCAM_REV)-sh4-linux:sbin/oscamd"
 
 .PHONY: fs-list
 fs-list:

dist/README

@@ -250,14 +250,13 @@ Bugs:
 History:
 --------
 
-satip-axe-201810211549-15 - Sun Oct 21 2018
+satip-axe-2018 (build15) - ??
   - moved the releases (firmware files) to github
   - added minisatip8
-    - theaded mode is turned on by default (use -T to toggle)
     - updated minisatip code (latest minisatip 0.7.16)
     - note that some options were removed (-M) or added (-2)
     - follow /etc/config.default and this file
-    - fixed reported VDR problems (issue #108)
+    - fixed reported VDR problem (issue #108)
     - added DVB-S2 multistream support
   - fixed the improper tuner release problem for complex diseqc settings
     where one input is used by multiple tuners (minisatip7 and minisatip8)
@@ -265,9 +264,7 @@ satip-axe-201810211549-15 - Sun Oct 21 2018
   - modified net.ipv4.tcp_wmem (issue #102)
   - increased net.core.wmem_max=12582912 , it might help to prevent
     the UDP packet loss (issue #88)
-  - partly fixed time sync (ntpd) issue when DHCP is used (issue #109)
+  - fixed time sync (ntpd) issue when DHCP is used (issue #109)
-  - upgraded python to 3.5.6 (package)
-  - upgraded oscam to rev.11434
 
 satip-axe-201705251044-14 - Wed Jun  7 2017
   - kernel modules from idl4k-1.25.0.157 (frontend + demux)

fs-add/sbin/upgrade-fw

@@ -1,12 +1,11 @@
 #!/bin/sh
 
 FILE="$1"
-DOWNLOAD=""
 MTDDEV="/dev/mtd3"
 SAFEFILE="/root/new.fw"
 CHECKSTR="Linux-2.6.32.42_stm24_0208-idl4k"
-
+GITHUB1="https://github.com/perexg/satip-axe/tree/master/dist"
-GITHUB1="https://api.github.com/repos/perexg/satip-axe/releases"
+GITHUB2="https://github.com/perexg/satip-axe/blob/master/dist/$FILE?raw=true"
 
 if test "$PWD" != "/root" -a "$PWD" != "/"; then
   echo "Run this utility from / or /root directory"
@@ -18,65 +17,23 @@ if test "$FILE" = "-h" -o "$FILE" = "--help"; then
   exit 1
 fi
 
-if ! test -r "$FILE"; then
 if test -z "$FILE"; then
   echo "Trying to fetch the list of available firmware files:"
-  else
+  if ! wget -q -O /root/list.txt "$GITHUB1"; then
-    echo "Trying to fetch the URL for the firmware:"
-  fi
-  if ! wget -q -O /root/list.json "$GITHUB1"; then
     echo "FAILED"
     exit 1
   fi
-  cat /root/list.json | grep -E '("name"|"browser_download_url")' | \
+  grep -o -E ">satip-axe-.*.fw<" /root/list.txt | grep -o -E "satip-axe.*.fw"
-                        grep -v -E '"name":.*.tgz' | \
+  rm /root/list.txt
-                        while IFS="\n" read line
-  do
-    case "$line" in
-      \ *\"name\":*)
-        name=$(echo "$line" | cut -d '"' -f 4)
-        ;;
-      \ *\"browser_download_url\":*)
-        fw=$(echo "$line" | cut -d '/' -f 9 | cut -d '"' -f 1 | cut -d '.' -f 1)
-        fw="$fw.fw"
-        if test -z "$FILE"; then
-          printf "%-40s : %s\n" "$name" "$fw"
-        else
-          if test "$FILE" = "$fw"; then
-            f=$(echo "$line" | cut -d '"' -f 4)
-            echo "$f" > /root/url.txt
-            printf "  %s\n" "$f"
-          fi
-        fi
-        name=''
-        ;;
-    esac
-  done
-  rm /root/list.json
-  if test -z "$FILE"; then
   exit 0
 fi
-  if test -r /root/url.txt; then
-    DOWNLOAD=$(cat /root/url.txt)
-  fi
-fi
 
-if test -n "$DOWNLOAD"; then
+if ! test -r "$FILE"; then
-  echo "Downloading $FILE from $DOWNLOAD to $SAFEFILE:"
+  echo "Downloading $FILE:"
-  if ! wget -O - "$DOWNLOAD" | tar xOzf - "$FILE" > "$SAFEFILE"; then
+  if ! wget -O "$SAFEFILE" "$GITHUB2/$FILE"; then
-    echo "Unable to fetch firmware file $DOWNLOAD / $FILE"
+    echo "Unable to fetch firmware file $GITHUB2"
     exit 1
   fi
-  if ! test -r "$SAFEFILE"; then
-    echo "Unable to fetch firmware file $DOWNLOAD / $FILE"
-    exit 1
-  fi
-  FILESIZE=$(stat -c "%s" "$SAFEFILE")
-  if test -z "$FILESIZE" -o $FILESIZE -le 0; then
-    echo "Download failed (wrong file size)!"
-  else
-    echo "Downloaded firmware $FILE (file $SAFEFILE size $FILESIZE bytes)..."
-  fi
   FILE="$SAFEFILE"
 fi
 
@@ -112,7 +69,7 @@ while test 1 -eq 1; do
   nanddump -f "$SAFEFILE.old" -l "$FILESIZE" "$MTDDEV"
   FILESIZE2=$(stat -c "%s" "$SAFEFILE.old")
   if test "$FILESIZE" -gt "$FILESIZE2"; then
-    echo "Unable to verify (file sizes does not match - $FILESIZE > $FILESIZE2)"
+    echo "Unable to verify (file sizes does not match - $FILESIZE > $FILESIZE2"
     exit 1
   fi
   if ! dd if=/dev/null seek="$FILESIZE" bs=1 of="$SAFEFILE.old" 2> /dev/null; then
@@ -121,7 +78,7 @@ while test 1 -eq 1; do
   fi
   FILESIZE2=$(stat -c "%s" "$SAFEFILE.old")
   if test "$FILESIZE" != "$FILESIZE2"; then
-    echo "Unable to verify (file sizes does not match - $FILESIZE != $FILESIZE2)"
+    echo "Unable to verify (file sizes does not match - $FILESIZE != $FILESIZE2"
     exit 1
   fi
   result=$(diff "$SAFEFILE.old" "$SAFEFILE")