updates for latest inverto drivers

Makefile

@@ -1,4 +1,4 @@
-BUILD=9
+BUILD=10
 VERSION=$(shell date +%Y%m%d%H%M)-$(BUILD)
 CPUS=4
 CURDIR=$(shell pwd)
@@ -12,6 +12,13 @@ EXTRA_AXE_MODULES_DIR=firmware/initramfs/root/modules_idl4k_7108_ST40HOST_LINUX_
 EXTRA_AXE_MODULES=axe_dmx.ko axe_dmxts.ko axe_fe.ko axe_fp.ko axe_i2c.ko \
                   stapi_core_stripped.ko stapi_ioctl_stripped.ko stsys_ioctl.ko
 
+EXTRA_AXE_LIBS_DIR=firmware/initramfs/usr/local/lib
+EXTRA_AXE_LIBS=libboost_date_time.so libboost_date_time.so.1.53.0 \
+               libboost_thread.so libboost_thread.so.1.53.0 \
+               libboost_filesystem.so libboost_filesystem.so.1.53.0 \
+               libboost_serialization.so libboost_serialization.so.1.53.0 \
+               libboost_system.so libboost_system.so.1.53.0
+
 ORIG_FILES=main_axe.out
 
 KMODULES = drivers/usb/serial/cp210x.ko \
@@ -110,7 +117,9 @@ fs.cpio: $(CPIO_SRCS)
 	  -r "$(VERSION)" \
 	  -b "bash strace openssl" \
 	  $(foreach m,$(EXTRA_AXE_MODULES), -e "$(EXTRA_AXE_MODULES_DIR)/$(m):lib/modules/axe/$(m)") \
+	  -e "patches/axe_dmxts_std.ko:lib/modules/axe/axe_dmxts_std.ko" \
 	  $(foreach m,$(ORIG_FILES), -e "$(EXTRA_AXE_MODULES_DIR)/../$(m):lib/modules/axe/$(m)") \
+	  $(foreach m,$(EXTRA_AXE_LIBS), -e "$(EXTRA_AXE_LIBS_DIR)/$(m):lib/$(m)") \
 	  -e "tools/i2c_mangle.ko:lib/modules/axe/i2c_mangle.ko" \
 	  $(foreach m,$(KMODULES), -e "kernel/$(m):lib/modules/$(m)") \
 	  -e "tools/axehelper:sbin/axehelper" \

firmware/.gitignore

@@ -1,2 +0,0 @@
-initramfs
-fw.tgz

firmware/idl4k.bin

@@ -1 +1 @@
-idl4k.bin-1.17.0.120
+idl4k-146.bin

fs-add/etc/init.d/rcS

@@ -66,7 +66,8 @@ insmod $d/i2c_mangle.ko
 insmod $d/axe_fe.ko
 insmod $d/axe_fp.ko
 insmod $d/axe_dmx.ko
-insmod $d/axe_dmxts.ko
+#insmod $d/axe_dmxts.ko
+insmod $d/axe_dmxts_std.ko
 mkdir -p /dev/axe /dev/stapi
 maj=
 for i in $(cat /proc/devices); do
@@ -92,15 +93,15 @@ for i in $(cat /proc/devices); do
     mknod /dev/axe/frontend-2 c $maj 2
     mknod /dev/axe/frontend-3 c $maj 3
   elif test "$i" = "demux"; then
-    mknod /dev/axe/demux-0 c $maj 0
-    mknod /dev/axe/demux-1 c $maj 1
-    mknod /dev/axe/demux-2 c $maj 2
-    mknod /dev/axe/demux-3 c $maj 3
+    mknod /dev/axe/demux-0 c $maj 1
+    mknod /dev/axe/demux-1 c $maj 0
+    mknod /dev/axe/demux-2 c $maj 3
+    mknod /dev/axe/demux-3 c $maj 2
   elif test "$i" = "demuxts"; then
-    mknod /dev/axe/demuxts-0 c $maj 0
-    mknod /dev/axe/demuxts-1 c $maj 1
-    mknod /dev/axe/demuxts-2 c $maj 2
-    mknod /dev/axe/demuxts-3 c $maj 3
+    mknod /dev/axe/demuxts-0 c $maj 1
+    mknod /dev/axe/demuxts-1 c $maj 0
+    mknod /dev/axe/demuxts-2 c $maj 3
+    mknod /dev/axe/demuxts-3 c $maj 2
   fi
   maj=
 done

tools/do_min_fs.py

@@ -592,5 +592,5 @@ for e in extra_list:
   dir = os.path.dirname(dst)
   if not os.path.exists('fs/' + dir):
     run_cmd('mkdir -p fs/' + dir)
-  run_cmd('cp ' + src + ' fs/' + dst)
+  run_cmd('cp -P ' + src + ' fs/' + dst)
 do_cpio('fs')

tools/s2i-dump.sh

@@ -6,14 +6,24 @@ if test -r /root/fw.tgz; then
   fi
   cd /1
   tar xvzf /root/fw.tgz
+  mkdir -p /dev/shm
+  mount -t tmpfs none /dev/shm -o size=1m,mode=330,uid=0,gid=0
   mount --bind /dev /1/dev
+  mkdir /1/dev/shm
+  mount --bind /dev/shm /1/dev/shm
   mount --bind /proc /1/proc
+  mount --bind /sys /1/sys
   cp -av /root/syscall-dump.so /1/usr/lib
   cp -av /root/s2i-dump.sh /1
   cp -av /usr/bin/strace /1/usr/bin
   rm /root/fw.tgz
   exit 0
 fi
+if ! test -d /.rwfs; then
+  mkdir -p /.rwfs
+  mount -t tmpfs -o size=30M,mode=0755 tmpfs /.rwfs
+  mkdir -p /.rwfs/etc
+fi
 if ! test -d /mnt/s2i-log; then
   mkdir -p /mnt/s2i-log
   mount -t tmpfs -o size=300M,mode=0755 tmpfs /mnt/s2i-log
@@ -22,9 +32,15 @@ if ! test -d /mnt/ramdisk; then
   mkdir -p /mnt/ramdisk
   mount -t tmpfs -o size=1024k,mode=0755 tmpfs /mnt/ramdisk
 fi
+if ! test -d /mnt/data; then
+  mkdir -p /mnt/data
+  mount -t tmpfs -o size=30M,mode=0755 tmpfs /mnt/data
+fi
+mkdir -p /media
 killall -9 mdnsd
 rm -f /mnt/s2i-log/*
 #TRACE="strace -r -ff -o /mnt/s2i-log/trace"
 LD_PRELOAD=/usr/lib/syscall-dump.so \
 SYSCALL_DUMP_LOG=/mnt/s2i-log/s2i.log \
+LD_LIBRARY_PATH=/usr/local/lib \
 $TRACE /root/s2i.bin