docker/Dockerfile: remove cmake and add apt-utils.

.gitignore

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

docker/Dockerfile

@@ -27,12 +27,24 @@ 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

@@ -23,10 +23,21 @@
 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..."
+	@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-2019 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 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-2019 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 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-2019 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 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-2019 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 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://www.lsts.pt/glued/$(basename $u)"
+	lsts_url="https://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-2019 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 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-2019 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 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-2019 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 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-2019 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 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,8 +37,7 @@ configure()
 {
     cd "../boost_$vendor_version" &&
     ./bootstrap.sh \
-        --with-icu="$cfg_dir_toolchain_sysroot/usr" \
-        --with-libraries="regex,filesystem,system,thread"
+        --with-icu="$cfg_dir_toolchain_sysroot/usr"
 
     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/curl/default.bash

@@ -35,11 +35,6 @@ build()
 host_install()
 {
     $cmd_make install
-    # make available for cross compilation
-    for f in "${cfg_dir_toolchain_sysroot}/usr/lib/"libcurl*so*; do
-        echo "Doing $f"
-        ln -s -f "$f" "${cfg_dir_toolchain}/lib"
-    done
 }
 
 target_install()

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/gcc/common.bash

@@ -5,12 +5,12 @@ version=\
 
 url=\
 (
-    "https://lsts.pt/glued/gcc-$version.tar.bz2"
+    "http://mirrors.kernel.org/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
 )
 
 md5=\
 (
-    '0abd6a50e1d6cf1642ae2414cc5a10b6'
+    '6f831b4d251872736e8e9cc09746f327'
 )
 
 build_dir=$pkg_var

rules/kplex/default.bash

@@ -1,25 +0,0 @@
-version=\
-(
-    '1.4'
-)
-
-url=\
-(
-    "https://github.com/stripydog/kplex/archive/v$version.tar.gz"
-)
-
-md5=\
-(
-    'df198384d2d7dee4b802136f4f9e9d44'
-)
-
-build()
-{
-    cd ../kplex-$version && $cmd_make VERBOSE=1 CC="$cmd_target_cc"
-}
-
-target_install()
-{
-    $cmd_cp ../kplex-$version/kplex "$cfg_dir_rootfs/usr/bin/kplex"
-}
-

rules/linux/default.bash

@@ -128,12 +128,14 @@ 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
 
@@ -142,6 +144,7 @@ build()
         $cmd_make \
             CROSS_COMPILE=$cfg_target_canonical- \
             ARCH=$cfg_target_linux \
+            DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
             zImage || return 1
     fi
 
@@ -150,6 +153,7 @@ build()
         $cmd_make \
             CROSS_COMPILE=$cfg_target_canonical- \
             ARCH=$cfg_target_linux \
+            DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
             dtbs || return 1
     fi
 
@@ -194,12 +198,21 @@ target_install()
         ARCH="$cfg_target_linux" \
         INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
         KBUILD_VERBOSE=1 \
+        DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
         modules_install
 
-    $cmd_make \
-        CROSS_COMPILE="$cfg_target_canonical-" \
-        ARCH="$cfg_target_linux" \
-        INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
-        KBUILD_VERBOSE=1 \
-        firmware_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
 }

rules/linux/rpi.bash

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

rules/make/host.bash

@@ -5,12 +5,12 @@ version=\
 
 url=\
 (
-    "https://lsts.pt/glued/make-$version.tar.bz2"
+    "http://ftp.gnu.org/gnu/make/make-$version.tar.bz2"
 )
 
 md5=\
 (
-    '69520444a44561c8ce10276eee8ec55e'
+    '1a11100f3c63fcf5753818e59d63088f'
 )
 
 maintainer=\

rules/ncurses/common.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    "6.1"
+    "5.9"
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    "98c889aaf8d23910d2b92d65be2e737a"
+    "8cb9c412e5f2d96bc6f459aa8c6282a1"
 )
 
 maintainer=\

rules/opencv/default.bash

@@ -63,11 +63,6 @@ host_install()
 {
     cd  ${pkg_build_dir}/../build &&
     $cmd_make install
-
-    # make available for cross compilation
-    for f in "$cfg_dir_toolchain_sysroot/usr/lib/"libopencv*so*; do
-       ln -s -f "$f" "$cfg_dir_toolchain/lib"
-    done
 }
 
 target_install()

rules/rpi-boot-firmware/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '2017-02-02'
+    '2018-08-17'
 )
 
 url=\
@@ -16,7 +16,7 @@ maintainer=\
 
 md5=\
 (
-    'eb42664fce4d73f167064e697dfacb76'
+    '2b06b9704616ee2a66829281bd480ff3'
 )
 
 target_install()

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

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

rules/zerotier/default.bash

@@ -1,34 +0,0 @@
-version=\
-(
-    '1.4.2'
-)
-
-url=\
-(
-    "https://github.com/zerotier/ZeroTierOne/archive/$version.tar.gz"
-)
-
-md5=\
-(
-    'c173f8b61bcdb23844a2669ff0d7bdf0'
-)
-
-build()
-{
-    cd ../ZeroTierOne-$version && $cmd_make \
-                VERBOSE=1 \
-                CC="$cmd_target_cc" \
-                CXX="$cmd_target_cxx" \
-		        LD="$cmd_target_ld" \
-                STRIP="$cmd_target_strip" \
-                CC_FLAGS="$cfg_target_gcc_flags"
-
-}
-
-target_install()
-{
-    $cmd_cp "../ZeroTierOne-$version/zerotier-one" "$cfg_dir_rootfs/usr/bin/zerotier-one"
-    ln -sf "$cfg_dir_rootfs/usr/bin/zerotier-one" "$cfg_dir_rootfs/usr/bin/zerotier-cli"
-    ln -sf "$cfg_dir_rootfs/usr/bin/zerotier-one" "$cfg_dir_rootfs/usr/bin/zerotier-idtool"
-}
-

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

@@ -1,3 +1,2 @@
 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

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

systems/lctr-a9xx/manta-sabuvis.cfg

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

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'

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

@@ -1,9 +0,0 @@
-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 libusb'
-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-2019 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 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-2019 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 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    #