systems/lctr-rpi/boot: add settings to test external sdcard.

.gitignore

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

docker/Dockerfile

@@ -27,24 +27,15 @@ 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
+RUN apt-get install -y bison
+RUN apt-get install -y flex
+RUN apt-get install -y libssl-dev

docker/Makefile

@@ -23,21 +23,10 @@
 TAG     := glued
 VERSION := 2016.05.0
 VOLUME  := $(CURDIR)/..
+DNS	:= 8.8.8.8
 
 all:
 	docker build -t $(TAG):$(VERSION) .
 
 shell:
-	docker run -w $(VOLUME) -i -a stdin -a stdout -v $(VOLUME):$(VOLUME) -t $(TAG):$(VERSION)
+	docker run -w $(VOLUME) --dns=$(DNS) -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

functions.bash

@@ -1,6 +1,6 @@
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2019 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #

mkconfig.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2019 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #

mkdisk.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2019 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #

mkpackage.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2019 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #
@@ -72,7 +72,7 @@ download()
         fi
 
 	# First try LSTS mirror.
-	lsts_url="https://lsts.pt/glued/$(basename $u)"
+	lsts_url="https://www.lsts.pt/glued/$(basename $u)"
         download_tool "$lsts_url" "$cfg_dir_downloads/$file"
         if [ $? -ne 0 ]; then
 	    # Then try OceanScan-MST mirror.

mksystem.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2019 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #

mkupdate.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2019 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #

pkrootfs.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2019 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #

pktoolchain.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2019 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #

rules/boost/default.bash

@@ -37,7 +37,8 @@ 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/exiftool/default.bash

@@ -0,0 +1,37 @@
+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/filesystem/fs/etc/rc.d/mount_sdcard_cm3

@@ -0,0 +1,14 @@
+start()
+{
+    echo "* Mounting external sdcard in /opt/lsts *"
+    mount /dev/mmcblk1p1 /opt/lsts
+    mkdir -p /opt/lsts/glued
+    mkdir -p /opt/lsts/dune
+}
+
+stop()
+{
+    echo "* Unmount external sdcard *"
+    umount /dev/mmcblk1p1
+}
+

rules/linux-headers/cross.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '4.4.66'
+    '4.19.60'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    '5353de56bf4621a35afc4384c7e51f30'
+    '3f8dfed50f9d9ff7247b3d6da4fd35a3'
 )
 
 maintainer=\

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
+    #$cmd_make \
-    if [[ $cfg_sys_family == *rpi* ]]; then
+    #    CROSS_COMPILE="$cfg_target_canonical-" \
-        echo "RPI family, no need of firmware_install"
+    #    ARCH="$cfg_target_linux" \
-        sleep 2
+    #    INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
-    else
+    #    KBUILD_VERBOSE=1 \
-        sleep 2
+    #    firmware_install
-        $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
 }

rules/linux/rpi.bash

@@ -2,7 +2,7 @@
 
 version=\
 (
-    '4.14_2018-08-17'
+    '4.19_2019-07-29'
 )
 
 url=\
@@ -12,7 +12,7 @@ url=\
 
 md5=\
 (
-    '074e40d83f4f4a99449acb08f8ddcbec'
+    'a9fac458f26bf4a3f3d9c981c7e51dd9'
 )
 
 build_dir="rpi-linux-rpi-linux-$version"

rules/rpi-boot-firmware/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '2018-08-17'
+    '2019-07-29'
 )
 
 url=\
@@ -10,20 +10,17 @@ url=\
 
 maintainer=\
 (
-    'Ricardo Martins <rasm@fe.up.pt>'
     'Pedro Gonçalves <pedro@lsts.pt>'
 )
 
 md5=\
 (
-    '2b06b9704616ee2a66829281bd480ff3'
+    '5b35887b1026fafe8174f473679d175a'
 )
 
 target_install()
 {
     $cmd_mkdir "$cfg_dir_rootfs/boot"
-
     $cmd_cp "../$pkg-$version/"* "$cfg_dir_rootfs/boot/"
-
     tar -C "$pkg_dir/fs" -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }

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/lauv-nemo-1-aux.cfg

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

systems/lctr-a6xx/geode-testbed.cfg

@@ -0,0 +1,2 @@
+cfg_hostname='geode-testbed'
+cfg_eth_ext_ip='10.0.200.64'

systems/lctr-a9xx/manta-sabuvis.cfg

@@ -0,0 +1,2 @@
+cfg_hostname='manta-sabuvis'
+cfg_eth_ext_ip='10.0.30.26'

systems/lctr-rpi/fs/boot/config.txt

@@ -4,6 +4,15 @@ arm_freq=1000
 # Disable BT on Rpi3.
 dtoverlay=pi3-disable-bt
 
-# Enable RasPicam
+dtoverlay=uart1
-start_x=1
+dtoverlay=uart0
-gpu_mem=128
+
+### EXTERNAL SDCARD OPTIONS
+# Activate external sdcard in CM3 [22 at 27]
+#dtoverlay=sdio,poll_once=off
+
+#Activate external sdcard in CM3 [34 at 39]
+#dtoverlay=sdio34,poll_once=off,gpios_34_39
+#dtoverlay=sdio34,poll_once=off,bus_width=4,gpios_34_39
+#dtoverlay=sdio34,poll_once=off,bus_width=4,sdio_overclock=30
+#dtoverlay=sdio34,poll_once=off,bus_width=4,gpios_34_39,sdio_overclock=30

systems/lctr-rpi/test-rpi-cm3.cfg

@@ -0,0 +1,9 @@
+cfg_hostname='test-rpi-cm3'
+cfg_eth_ext_ip='10.0.200.52'
+cfg_services1=''
+cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind rpi-boot-firmware linux/rpi'
+cfg_services0='network dropbear storage upgrade syslog ptpd mount_sdcard_cm3'
+cfg_modules="$cfg_modules ftdi_sio"
+cfg_terminal='tty1'
+cfg_ptpd_interface='eth0'
+

systems/lctr-rpi/test-rpi-eth0.cfg

@@ -0,0 +1,9 @@
+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 exiftool'
+cfg_services0='network dropbear storage upgrade syslog ptpd'
+cfg_modules="$cfg_modules ftdi_sio"
+cfg_terminal='tty1'
+cfg_ptpd_interface='eth0'
+

utils/glued-check-sources.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2019 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #

utils/glued-download-sources.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2019 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #