add minisatip7 (minisatip 0.7)

Makefile

@@ -32,6 +32,7 @@ KMODULES = drivers/usb/serial/cp210x.ko \
 
 MINISATIP_COMMIT=54df9348e7bd7e6075f54f1b93ec4ad36429abe0
 MINISATIP5_COMMIT=67e88c2d743d6df9c4a96aad772414169f61b764
+MINISATIP7_COMMIT=407833b54abb8b62773bed6a6c04f676abf8d356
 
 BUSYBOX=busybox-1.24.1
 
@@ -122,6 +123,7 @@ CPIO_SRCS += dropbear
 CPIO_SRCS += ethtool
 CPIO_SRCS += minisatip
 CPIO_SRCS += minisatip5
+CPIO_SRCS += minisatip7
 CPIO_SRCS += oscam
 CPIO_SRCS += tools/axehelper
 CPIO_SRCS += nfsutils
@@ -151,6 +153,8 @@ fs.cpio: $(CPIO_SRCS)
 	  $(foreach f,$(notdir $(wildcard apps/minisatip/icons/*)), -e "apps/minisatip/icons/$f:usr/share/minisatip/icons/$f") \
 	  -e "apps/minisatip5/minisatip:sbin/minisatip5" \
 	  $(foreach f,$(notdir $(wildcard apps/minisatip5/html/*)), -e "apps/minisatip5/html/$f:usr/share/minisatip/html/$f") \
+	  -e "apps/minisatip7/minisatip:sbin/minisatip7" \
+	  $(foreach f,$(notdir $(wildcard apps/minisatip7/html/*)), -e "apps/minisatip7/html/$f:usr/share/minisatip7/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-unstable_svn$(OSCAM_REV)-sh4-linux:sbin/oscamd"
@@ -345,22 +349,54 @@ minisatip5: apps/minisatip5/minisatip
 minisatip5-clean:
 	rm -rf apps/minisatip5
 
+#
+# minisatip7
+#
+
+apps/minisatip7/axe.h: patches/minisatip7-axe.patch
+	rm -rf apps/minisatip7
+	$(call GIT_CLONE,https://github.com/catalinii/minisatip.git,minisatip7,$(MINISATIP7_COMMIT))
+	cd apps/minisatip7; patch -p1 < ../../patches/minisatip7-axe.patch
+
+apps/minisatip7/minisatip: apps/minisatip7/axe.h
+	cd apps/minisatip7 && ./configure \
+		--enable-axe \
+		--disable-dvbca \
+		--disable-dvbcsa \
+		--disable-dvbaes \
+		--disable-netceiver
+	make -C apps/minisatip7 \
+	  CC=$(TOOLCHAIN)/bin/sh4-linux-gcc \
+	  EXTRA_CFLAGS="-O2 -I$(CURDIR)/kernel/include"
+
+.PHONY: minisatip7
+minisatip7: apps/minisatip7/minisatip
+
+.PHONY: minisatip7-clean
+minisatip7-clean:
+	rm -rf apps/minisatip7
+
 #
 # minisatip package
 #
 
-dist/packages/minisatip-$(VERSION).tar.gz: minisatip minisatip5
+dist/packages/minisatip-$(VERSION).tar.gz: minisatip minisatip5 minisatip7
 	rm -rf fs/usr/share/minisatip
-	mkdir -p fs/usr/share/minisatip/icons/ fs/usr/share/minisatip/html/
+	mkdir -p fs/usr/share/minisatip/icons/ \
+		 fs/usr/share/minisatip/html/ \
+		 fs/usr/share/minisatip7/html/
 	install -m 755 apps/minisatip/minisatip fs/sbin/minisatip
 	install -m 644 apps/minisatip/icons/* fs/usr/share/minisatip/icons/
 	install -m 755 apps/minisatip5/minisatip fs/sbin/minisatip5
 	install -m 644 apps/minisatip5/html/* fs/usr/share/minisatip/html/
+	install -m 755 apps/minisatip7/minisatip fs/sbin/minisatip7
+	install -m 644 apps/minisatip7/html/* fs/usr/share/minisatip7/html/
 	tar cvz -C fs -f dist/packages/minisatip-$(VERSION).tar.gz \
 		sbin/minisatip \
 		sbin/minisatip5 \
 		usr/share/minisatip/icons \
-		usr/share/minisatip/html
+		usr/share/minisatip/html \
+		usr/share/minisatip7/html
 	ls -la dist/packages/minisatip*
 
 .PHONY: minisatip-package

fs-add/etc/config.default

@@ -2,7 +2,7 @@
 # SATIP AXE firmware configuration
 #
 
-CFGVER="11"
+CFGVER="12"
 HOSTNAME="satip-axe"
 KMODULES="drivers/usb/serial/cp210x.ko drivers/usb/serial/pl2303.ko drivers/usb/serial/ftdi_sio.ko"
 
@@ -54,8 +54,8 @@ DROPBEAR="yes"
 #
 # minisatip
 #
-MINISATIP="yes"
-MINISATIP_OPTS=""
+#MINISATIP="yes"
+#MINISATIP_OPTS=""
 
 #
 # minisatip 0.5
@@ -63,6 +63,12 @@ MINISATIP_OPTS=""
 #MINISATIP5="yes"
 #MINISATIP5_OPTS=""
 
+#
+# minisatip 0.7
+#
+MINISATIP7="yes"
+MINISATIP7_OPTS=""
+
 #
 # inetd (httpd,ftpd)
 #

fs-add/etc/init.d/satip

@@ -2,9 +2,10 @@
 
 MINISATIP_PROGRAM=minisatip
 MINISATIP5_PROGRAM=minisatip5
+MINISATIP7_PROGRAM=minisatip7
 test -r /etc/sysconfig/config && . /etc/sysconfig/config
 
-if test "$MINISATIP" != "yes" -a "$MINISATIP5" != "yes"; then
+if test "$MINISATIP" != "yes" -a "$MINISATIP5" != "yes" -a "$MINISATIP7" != "yes"; then
   exit 0
 fi
 
@@ -26,6 +27,7 @@ while test ! -f /tmp/nosatip; do
   done
   MINISATIP_PROGRAM=minisatip
   MINISATIP5_PROGRAM=minisatip5
+  MINISATIP7_PROGRAM=minisatip7
   . /etc/sysconfig/config
   if test "$MINISATIP" = "yes"; then
     nice -5 $MINISATIP_PROGRAM -f -g $MINISATIP_OPTS
@@ -33,6 +35,9 @@ while test ! -f /tmp/nosatip; do
   elif test "$MINISATIP5" = "yes"; then
     nice -5 $MINISATIP5_PROGRAM -f -g $MINISATIP5_OPTS
     logger -p local0.notice "minisatip5 exited $?, restarting"
+  elif test "$MINISATIP7" = "yes"; then
+    nice -5 $MINISATIP7_PROGRAM -f -g $MINISATIP7_OPTS
+    logger -p local0.notice "minisatip7 exited $?, restarting"
   else
     exit 0
   fi

patches/minisatip7-axe.patch

@@ -0,0 +1,38 @@
+diff --git a/minisatip.c b/minisatip.c
+index 840ad20..df140fa 100755
+--- a/minisatip.c
++++ b/minisatip.c
+@@ -72,7 +72,7 @@ static const struct option long_options[] =
+ 	{ "jess", required_argument, NULL, 'j' },
+ 	{ "diseqc", required_argument, NULL, 'd' },
+ 	{ "diseqc-timing", required_argument, NULL, 'q' },
+-	{"nopm", required_argument, NULL, 'Z'},
++	{ "nopm", required_argument, NULL, 'Z' },
+ #ifndef DISABLE_DVBAPI
+ 	{ "dvbapi", required_argument, NULL, 'o' },
+ #endif
+@@ -473,10 +473,9 @@ void set_options(int argc, char *argv[])
+ #endif
+ 
+ #ifdef AXE
+-	opts.nopm = 1;
+ 	opts.no_threads = 1;
+ 	opts.axe_skippkt = 35;
+-	opts.document_root = "/usr/share/minisatip/html";
++	opts.document_root = "/usr/share/minisatip7/html";
+ #define AXE_OPTS "7:QW:M:8:A:"
+ #else
+ #define AXE_OPTS ""
+diff --git a/minisatip.h b/minisatip.h
+index 88f47dc..f501fe6 100644
+--- a/minisatip.h
++++ b/minisatip.h
+@@ -10,7 +10,7 @@
+ 
+ #define VERSION_BUILD "4"
+ #define CC(a,b,c) #a b #c
+-#define VERSION CC(0.7.,VERSION_BUILD,)
++#define VERSION CC(0.7.,VERSION_BUILD,-axe201)
+ 
+ void set_options (int argc, char *argv[]);
+