lctr-rpi/rpi-camera-aux: add lauv-storage-client to cfg_services1.

.gitignore

@@ -11,4 +11,3 @@
 /ntnu-b2xx
 /stamp9g20
 /lctr-rpi
-build.bash

docker/Makefile

@@ -23,13 +23,12 @@
 TAG     := glued
 VERSION := 2016.05.0
 VOLUME  := $(CURDIR)/..
-DNS	:= 8.8.8.8
 
 all:
 	docker build -t $(TAG):$(VERSION) .
 
 shell:
-	docker run -w $(VOLUME) --dns=$(DNS) -i -a stdin -a stdout -v $(VOLUME):$(VOLUME) -t $(TAG):$(VERSION)
+	docker run -w $(VOLUME) -i -a stdin -a stdout -v $(VOLUME):$(VOLUME) -t $(TAG):$(VERSION)
 
 clean:
 	@echo "* Stopping docker service..."
@@ -39,6 +38,3 @@ clean:
 	@echo "* Starting docker service..."
 	@sudo systemctl start docker
 	@echo "* Done."
-
-delete_img:
-	@sudo docker system prune -a

mkpackage.bash

@@ -72,7 +72,7 @@ download()
         fi
 
 	# First try LSTS mirror.
-	lsts_url="https://www.lsts.pt/glued/$(basename $u)"
+	lsts_url="http://lsts.pt/glued/$(basename $u)"
         download_tool "$lsts_url" "$cfg_dir_downloads/$file"
         if [ $? -ne 0 ]; then
 	    # Then try OceanScan-MST mirror.

rules/bash/default.bash

@@ -1,45 +0,0 @@
-version=\
-(
-    "4.4.18"
-)
-
-url=\
-(
-    "http://ftp.gnu.org/gnu/bash/bash-$version.tar.gz"
-)
-
-md5=\
-(
-    '518e2c187cc11a17040f0915dddce54e'
-)
-
-maintainer=\
-(
-    'Pedro Gonçalves <pedro@fe.up.pt>'
-)
-
-
-configure()
-{
-    ./configure \
-    --prefix=${cfg_dir_rootfs} \
-    --host=${cfg_target_canonical} \
-    --bindir=${cfg_dir_toolchain}/bin \
-    --without-bash-malloc
-}
-
-build()
-{
-    $cmd_make VERBOSE=1
-}
-
-host_install()
-{
-    $cmd_make install
-}
-
-target_install()
-{
-    $cmd_cp bash ${cfg_dir_rootfs}/bin
-    $cmd_cp bashversion ${cfg_dir_rootfs}/bin
-}

rules/boost/default.bash

@@ -37,8 +37,7 @@ configure()
 {
     cd "../boost_$vendor_version" &&
     ./bootstrap.sh \
-        --with-icu="$cfg_dir_toolchain_sysroot/usr" \
+        --with-icu="$cfg_dir_toolchain_sysroot/usr"
-        --with-libraries="regex,filesystem,system,thread"
 
     GXX_VER=$(${cmd_target_cxx} -dumpversion)
     echo "using gcc : ${GXX_VER}  : ${cmd_target_cxx} : <cxxflags>\"-pipe -Os  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ${cfg_target_gcc_flags} \" <linkflags>\"\" ;" > user-config.jam

rules/boost/patches-1.55.0/00-boost_10125.patch

@@ -1,51 +0,0 @@
---- a/boost/thread/pthread/once.hpp
-+++ b/boost/thread/pthread/once.hpp
-@@ -42,7 +42,7 @@ namespace boost
-   }
- 
- #ifdef BOOST_THREAD_PROVIDES_ONCE_CXX11
--#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
-+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-     template<typename Function, class ...ArgTypes>
-     inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args);
- #else
-@@ -65,7 +65,7 @@ namespace boost
-   private:
-       volatile thread_detail::uintmax_atomic_t epoch;
- 
--#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
-+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-       template<typename Function, class ...ArgTypes>
-       friend void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args);
- #else
-@@ -118,7 +118,7 @@ namespace boost
-     // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2444.html
- 
- 
--#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
-+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
- 
- 
-   template<typename Function, class ...ArgTypes>
---- a/boost/thread/pthread/once_atomic.hpp
-+++ b/boost/thread/pthread/once_atomic.hpp
-@@ -115,7 +115,7 @@ namespace boost
- #endif
- 
- 
--#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
-+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
- 
-   template<typename Function, class ...ArgTypes>
-   inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args)
---- a/boost/thread/win32/once.hpp
-+++ b/boost/thread/win32/once.hpp
-@@ -227,7 +227,7 @@ namespace boost
-         }
-     }
- 
--#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
-+#if !defined BOOST_NO_CXX11_VARIADIC_TEMPLATES && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
- //#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR)
-     inline void call_once(once_flag& flag, void (*f)())
-     {

rules/busybox/config

@@ -267,7 +267,7 @@ CONFIG_MV=y
 CONFIG_PRINTF=y
 CONFIG_PWD=y
 CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
+# CONFIG_FEATURE_READLINK_FOLLOW is not set
 CONFIG_REALPATH=y
 CONFIG_RM=y
 CONFIG_RMDIR=y
@@ -943,7 +943,7 @@ CONFIG_FEATURE_TOPMEM=y
 CONFIG_UPTIME=y
 # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
 CONFIG_FREE=y
-CONFIG_FUSER=y
+# CONFIG_FUSER is not set
 CONFIG_KILL=y
 CONFIG_KILLALL=y
 # CONFIG_KILLALL5 is not set

rules/exiftool/default.bash

@@ -1,37 +0,0 @@
-version=\
-(
-  "10.96"
-)
-
-url=\
-(
-  "https://lsts.pt/glued/exiftoolBin-${version}.tar.gz"
-)
-
-md5=\
-(
-  "71d52bf2d75f023b844dd8c9100daaff"
-)
-
-maintainer=\
-(
-  'Pedro Gonçalves <pedro@lsts.pt>'
-)
-
-requires=\
-(
-    'perl/default'
-)
-
-post_unpack()
-{
-    $cmd_cp -r ../exiftoolBin-${version}/* .
-}
-
-target_install()
-{
-   $cmd_cp -rv usr/* $cfg_dir_toolchain_sysroot/usr/
-   $cmd_cp -rv usr/* $cfg_dir_rootfs/usr/
-   $cmd_cp -rv usr/local/bin/* $cfg_dir_rootfs/usr/bin/
-}
-

rules/exiv2/default.bash

@@ -18,6 +18,11 @@ maintainer=\
     'Pedro Gonçalves <pedro@lsts.pt>'
 )
 
+requires=\
+(
+    "gettext/host"
+)
+
 configure()
 {
   ./configure \

rules/linux/default.bash

@@ -201,12 +201,6 @@ target_install()
         DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
         modules_install
 
-    echo $cfg_sys_family
-    if [[ $cfg_sys_family == *rpi* ]]; then
-        echo "RPI family, no need of firmware_install"
-        sleep 2
-    else
-        sleep 2
     $cmd_make \
         CROSS_COMPILE="$cfg_target_canonical-" \
         ARCH="$cfg_target_linux" \
@@ -214,5 +208,4 @@ target_install()
         KBUILD_VERBOSE=1 \
         DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
         firmware_install
-    fi
 }

rules/linux/rpi.bash

@@ -2,7 +2,7 @@
 
 version=\
 (
-    '4.14_2018-08-17'
+    '4.4_2017-01-27'
 )
 
 url=\
@@ -12,7 +12,7 @@ url=\
 
 md5=\
 (
-    '074e40d83f4f4a99449acb08f8ddcbec'
+    'f31d48a9d2c93509b35e750be489b44c'
 )
 
 build_dir="rpi-linux-rpi-linux-$version"

rules/netcat/default.bash

@@ -5,7 +5,7 @@ version=\
 
 url=\
 (
-    "https://sourceforge.net/projects/nc$version/files/unix%20netcat%201.10%20by%20_Hobbit_/nc$version.tgz"
+    "https://kent.dl.sourceforge.net/project/nc$version/unix%20netcat%201.10%20by%20_Hobbit_/%5BUnnamed%20release%5D/nc$version.tgz"
 )
 
 md5=\

rules/perl/default.bash

@@ -29,7 +29,7 @@ post_unpack()
     fi
 
     sed 's/libs = $perllibs $cryptlib/libs = $perllibs $cryptlib -lm/g' Makefile.SH -i &&
-    $cmd_make_single -v Makefile.SH{,.orig} &&
+    $cmd_cp -v Makefile.SH{,.orig} &&
     sed -e "s@pldlflags=''@pldlflags=\"\$cccdlflags\"@g" \
         -e "s@static_target='static'@static_target='static_pic'@g" Makefile.SH.orig > Makefile.SH
 }

rules/rpi-boot-firmware/default.bash

@@ -1,11 +1,11 @@
 version=\
 (
-    '2018-08-17'
+    '2017-02-02'
 )
 
 url=\
 (
-    "http://www.lsts.pt/glued/rpi-boot-firmware-$version.zip"
+    "http://lsts.pt/glued/rpi-boot-firmware-$version.zip"
 )
 
 maintainer=\
@@ -16,7 +16,7 @@ maintainer=\
 
 md5=\
 (
-    '2b06b9704616ee2a66829281bd480ff3'
+    'eb42664fce4d73f167064e697dfacb76'
 )
 
 target_install()

rules/rpi-boot-firmware/fs/boot/cmdline.txt

@@ -1 +1 @@
-dwc_otg.lpm_enable=0 console=ttyAMA0,115200,8n1 root=/dev/mmcblk0p2 elevator=deadline rootwait quiet
+dwc_otg.lpm_enable=0 console=tty1 root=/dev/mmcblk0p2 elevator=deadline rootwait quiet

systems/lauv-aux-rpi/fs/etc/rc.d/lauv-storage-client

@@ -0,0 +1,45 @@
+mount_path()
+{
+    rpath="$cfg_lauv_storage_host:$1"
+    lpath="$1"
+
+    mkdir -p "$lpath"
+
+    mount -t nfs -o wsize=32768 "$rpath" "$lpath"
+    if [ $? -eq 0 ]; then
+        echo "* Mounted '$rpath' in '$lpath'"
+        return 0
+    fi
+
+    return 1
+}
+
+start()
+{
+    /usr/bin/rpcbind
+    if [ $? -ne 0 ]; then
+        echo "ERROR: failed to start rpcbind."
+        return 1
+    fi
+
+    for path in $cfg_lauv_storage_paths; do
+        n=0; while [ $n -lt "$cfg_lauv_storage_timeout" ]; do
+                 mount_path "$path"
+                 if [ $? -eq 0 ]; then
+                     break
+                 fi
+
+                 let n++
+                 sleep 1
+             done
+    done
+}
+
+stop()
+{
+    killall rpcbind
+
+    for path in $cfg_lauv_storage_paths; do
+        umount "$path"
+    done
+}

systems/lauv-aux-rpi/fs/etc/rc.d/usbmount

@@ -0,0 +1,28 @@
+try_mount_storage()
+{
+    n=0; while [ $n -lt 30 ]; do
+             /bin/mount "$1" /opt/lsts/dune/log
+
+             if [ $? -eq 0 ]; then
+                 return 0
+             fi
+
+             sleep 1
+             let n++
+         done
+
+    return 1
+}
+
+start()
+{
+    try_mount_storage /dev/sda1
+    echo "* USB Mounted in /opt/lsts/dune/log"
+}
+
+stop()
+{
+    /bin/umount /dev/sda1
+    echo "* USB Umounted"
+}
+

systems/lauv-aux-rpi/lauv-nemo-1-aux-cmre.cfg

@@ -1,6 +0,0 @@
-cfg_hostname='lauv-nemo-1-aux-cmre'
-cfg_eth_ext_ip='10.0.10.63'
-cfg_eth_ext_mk='255.255.0.0'
-cfg_eth_ext_gw='10.0.0.1'
-cfg_ptpd_interface='eth0'
-cfg_packages="$cfg_packages boost bash libconfig log4cpp fftw socat crypto++ netcat screen rlwrap"

systems/lauv-aux-rpi/lauv-nemo-1-aux.cfg

@@ -1,3 +0,0 @@
-cfg_hostname='lauv-nemo-1-aux'
-cfg_eth_ext_ip='10.0.10.63'
-cfg_packages="$cfg_packages boost bash"

systems/lauv-aux-rpi/lauv-xtreme-2-cam.cfg

@@ -0,0 +1,11 @@
+cfg_hostname='lauv-xtreme-2-cam'
+cfg_eth_ext_ip='10.0.10.52'
+cfg_eth_ext_mk='255.255.0.0'
+cfg_eth_ext_gw='10.0.0.1'
+cfg_lauv_storage_dir=/opt/lsts/dune/log
+cfg_lauv_storage_host=10.0.10.53
+cfg_lauv_storage_paths=/opt/lsts/dune/log
+cfg_lauv_storage_timeout=60
+cfg_ptpd_interface='eth0'
+cfg_services1='lauv-storage-client'
+cfg_packages='dropbear rsync busybox e2fsprogs dosfstools rpcbind rpi-boot-firmware linux/rpi exiv2 pointgrey opencv nfs-utils ptpd'

systems/lctr-a6xx/lauv-nemo-1.cfg

@@ -1,2 +0,0 @@
-cfg_hostname='lauv-nemo-1'
-cfg_eth_ext_ip='10.0.10.60'

systems/lctr-a6xx/lauv-xtreme-2.cfg

@@ -1,6 +1,6 @@
 cfg_hostname='lauv-xtreme-2'
 cfg_eth_ext_ip='10.0.10.50'
-cfg_packages="$cfg_packages rpcbind nfs-utils"
+cfg_packages="$cfg_packages rpcbind nfs-utils exiv2 opencv"
 cfg_services1='lauv-storage-client'
 cfg_lauv_storage_host='10.0.10.53'
 cfg_lauv_storage_paths='/opt/lsts/dune/log'

systems/lctr-b2xx/lauv-noptilus-1-aux-cmre.cfg

@@ -1,8 +0,0 @@
-cfg_hostname='lauv-noptilus-1-aux-cmre'
-cfg_storage='data0:ext4:/opt data1:ext4:/opt/lsts/dune/log'
-cfg_eth_ext_ip='10.0.10.83'
-cfg_eth_ext_mk='255.255.0.0'
-cfg_eth_ext_gw='10.0.0.1'
-cfg_ptpd_interface='eth0'
-cfg_packages="$cfg_packages u-boot ptpd i2c-tools am33xx-cm3/host linux dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind nfs-utils libconfig log4cpp fftw socat crypto++ netcat screen rlwrap boost bash"
-

systems/lctr-b2xx/lauv-noptilus-2-aux-cmre.cfg

@@ -1,8 +0,0 @@
-cfg_hostname='lauv-noptilus-2-aux-cmre'
-cfg_storage='data0:ext4:/opt data1:ext4:/opt/lsts/dune/log'
-cfg_eth_ext_ip='10.0.10.93'
-cfg_eth_ext_mk='255.255.0.0'
-cfg_eth_ext_gw='10.0.0.1'
-cfg_ptpd_interface='eth0'
-cfg_packages="$cfg_packages u-boot ptpd i2c-tools am33xx-cm3/host linux dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind nfs-utils libconfig log4cpp fftw socat crypto++ netcat screen rlwrap boost bash"
-

systems/lctr-b2xx/lauv-noptilus-3-aux-cmre.cfg

@@ -1,8 +0,0 @@
-cfg_hostname='lauv-noptilus-3-aux-cmre'
-cfg_storage='data0:ext4:/opt data1:ext4:/opt/lsts/dune/log'
-cfg_eth_ext_ip='10.0.10.103'
-cfg_eth_ext_mk='255.255.0.0'
-cfg_eth_ext_gw='10.0.0.1'
-cfg_ptpd_interface='eth0'
-cfg_packages="$cfg_packages u-boot ptpd i2c-tools am33xx-cm3/host linux dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind nfs-utils libconfig log4cpp fftw socat crypto++ netcat screen rlwrap boost bash"
-

systems/lctr-b2xx/lauv-noptilus-3-aux.cfg

@@ -4,4 +4,3 @@ cfg_eth_ext_ip='10.0.10.103'
 cfg_eth_ext_mk='255.255.0.0'
 cfg_eth_ext_gw='10.0.0.1'
 cfg_ptpd_interface='eth0'
-cfg_packages="$cfg_packages bash"

systems/lctr-rpi/config

@@ -3,7 +3,7 @@ cfg_storage='data0:ext4:/opt'
 cfg_modules=''
 cfg_services0='network dropbear storage upgrade syslog ptpd'
 cfg_services2='dune'
-cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind rpi-boot-firmware linux/rpi exiftool libusb'
+cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind rpi-boot-firmware linux/rpi'
 cfg_target_linux_kernel='arch/arm/boot/zImage'
 cfg_ptpd_interface='eth0'
 cfg_eth_ext_mk='255.255.0.0'
@@ -11,7 +11,7 @@ cfg_eth_ext_gw='10.0.0.1'
 cfg_terminal='tty1'
 cfg_partitions=\
 (
-    rpi-boot BOOT0  512B    64MiB
+    rpi-boot BOOT0  512B    32MiB
-    root     root0  64MiB   576MiB
+    root     root0  32MiB   544MiB
-    data     data0  576MiB  -1
+    data     data0  544MiB  -1
 )

systems/lctr-rpi/test-rpi.cfg

@@ -1,7 +1,7 @@
 cfg_hostname='test-rpi'
 cfg_eth_ext_ip='10.0.200.52'
 cfg_services1=''
-cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind rpi-boot-firmware linux/rpi libconfig log4cpp crypto++ bash'
+cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind rpi-boot-firmware linux/rpi libconfig log4cpp crypto++'
 cfg_services0='network dropbear storage upgrade syslog ptpd'
 cfg_modules="$cfg_modules ftdi_sio"
 cfg_terminal='ttyAMA0'

systems/lctr-rpi/titan.cfg

@@ -1,4 +0,0 @@
-cfg_hostname='titan'
-cfg_eth_ext_ip='10.0.20.150'
-cfg_packages="$cfg_packages libjpeg-turbo v4l-utils uv4l libav boost bash"
-cfg_modules="$cfg_modules ftdi_sio"