filesystem: configuration for Swarms network.

docker/Dockerfile

@@ -27,24 +27,12 @@ MAINTAINER Ricardo Martins <rasm@oceanscan-mst.com>
 ENV DEBIAN_FRONTEND noninteractive
 
 # Update distro.
-RUN echo "deb http://ftp.us.debian.org/debian testing non-free contrib" >> /etc/apt/sources.list
-RUN echo "deb http://mirrors.fe.up.pt/ubuntu xenial main restricted universe multiverse" >> /etc/apt/sources.list
-RUN echo "deb http://mirrors.fe.up.pt/ubuntu xenial-updates main restricted universe multiverse" >> /etc/apt/sources.list
-RUN echo "deb http://mirrors.fe.up.pt/ubuntu xenial-backports main restricted universe multiverse" >> /etc/apt/sources.list
-RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32
 RUN apt-get update -y
 RUN apt-get dist-upgrade -y
-RUN apt-get install -y apt-utils
-RUN apt-get install -y g++-5
-RUN apt-get install -y gcc-5
 RUN apt-get install -y wget
 RUN apt-get install -y bzip2
 RUN apt-get install -y git
 RUN apt-get install -y g++-multilib
+RUN apt-get install -y cmake
 RUN apt-get install -y file
-RUN apt-get install -y vim
-RUN apt-get install -y nasm
-RUN apt-get install -y build-essential
-RUN apt-get install -y make
 RUN apt-get install -y kmod
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 60 --slave /usr/bin/g++ g++ /usr/bin/g++-5

docker/Makefile

@@ -29,15 +29,3 @@ all:
 
 shell:
 	docker run -w $(VOLUME) -i -a stdin -a stdout -v $(VOLUME):$(VOLUME) -t $(TAG):$(VERSION)
-
-clean:
-	@echo "* Stopping docker service..."
-	@sudo systemctl stop docker
-	@echo "* Cleaning docker service..."
-	@sudo rm -rf /var/lib/docker
-	@echo "* Starting docker service..."
-	@sudo systemctl start docker
-	@echo "* Done."
-
-delete_img:
-	@sudo docker system prune -a

rules/filesystem/fs/etc/rc.d/network

@@ -62,6 +62,12 @@ start()
             arp -s "$ip" "$mac"
         done
     fi
+
+    # swarms network
+    if [ -n "$cfg_eth_swarms_ip" ]; then
+        ifconfig eth0:swarms "$cfg_eth_swarms_ip" netmask "$cfg_eth_swarms_mk" up
+        route add -net 192.168.0.0 netmask "$cfg_eth_swarms_mk" dev eth0
+    fi
 }
 
 stop()

rules/linux/default.bash

@@ -128,14 +128,12 @@ build()
     $cmd_make \
         CROSS_COMPILE=$cfg_target_canonical- \
         ARCH=$cfg_target_linux \
-        DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
         modules || return 1
 
     if [ "$(basename $cfg_target_linux_kernel)" = 'uImage' ]; then
         $cmd_make \
             CROSS_COMPILE=$cfg_target_canonical- \
             ARCH=$cfg_target_linux \
-            DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
             uImage || return 1
     fi
 
@@ -144,7 +142,6 @@ build()
         $cmd_make \
             CROSS_COMPILE=$cfg_target_canonical- \
             ARCH=$cfg_target_linux \
-            DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
             zImage || return 1
     fi
 
@@ -153,7 +150,6 @@ build()
         $cmd_make \
             CROSS_COMPILE=$cfg_target_canonical- \
             ARCH=$cfg_target_linux \
-            DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
             dtbs || return 1
     fi
 
@@ -198,21 +194,12 @@ target_install()
         ARCH="$cfg_target_linux" \
         INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
         KBUILD_VERBOSE=1 \
-        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" \
-            INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
-            KBUILD_VERBOSE=1 \
-            DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
-            firmware_install
-    fi
+    $cmd_make \
+        CROSS_COMPILE="$cfg_target_canonical-" \
+        ARCH="$cfg_target_linux" \
+        INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
+        KBUILD_VERBOSE=1 \
+        firmware_install
 }

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/rpi-boot-firmware/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '2018-08-17'
+    '2017-02-02'
 )
 
 url=\
@@ -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/lctr-a6xx/buv-petinga-1.cfg

@@ -1,2 +0,0 @@
-cfg_hostname='buv-petinga-1'
-cfg_eth_ext_ip='10.0.10.170'

systems/lctr-a9xx/manta-rugged-2.cfg

@@ -1,2 +0,0 @@
-cfg_hostname='manta-rugged-2'
-cfg_eth_ext_ip='10.0.30.25'

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"
-cfg_modules="$cfg_modules ftdi_sio"

systems/lctr-rpi/x8-06-aux.cfg

@@ -1,9 +0,0 @@
-cfg_hostname='x8-06-aux'
-cfg_eth_ext_ip='10.0.20.109'
-cfg_services1='lauv-storage-server'
-cfg_packages="$cfg_packages opencv raspicam exiv2 libav uswitch nfs-utils"
-cfg_modules="$cfg_modules ftdi_sio"
-cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lauv-aux.dtb'
-cfg_ptpd_interface='eth0'
-cfg_terminal='ttyAMA0'
-cfg_lauv_storage_dir='/opt/lsts/dune/log'