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

Authored By: Ricardo Martins

docker/Dockerfile

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

@@ -29,3 +29,15 @@ 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

mkconfig.bash

@@ -23,7 +23,7 @@
 ###########################################################################
 
 # Config: GLUED version.
-cfg_glued_version='2016.05'
+cfg_glued_version='2017.11'
 # Config: GLUED vendor.
 cfg_glued_vendor='lsts'
 

mkpackage.bash

@@ -72,7 +72,7 @@ download()
         fi
 
 	# First try LSTS mirror.
-	lsts_url="http://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.

rules/gcc/cross.bash

@@ -49,10 +49,15 @@ host_install()
 
 target_install()
 {
-    $cmd_mkdir \
+    libdir=lib
-        "$cfg_dir_rootfs/usr/lib" &&
+    if [ -d "$cfg_dir_toolchain/$cfg_target_canonical/lib64" ]; then
+        libdir=lib64
+    fi
 
-    for f in "$cfg_dir_toolchain/$cfg_target_canonical/lib/"{libgcc_s,libstdc++}.so*; do
+    $cmd_mkdir \
+        "$cfg_dir_rootfs/usr/$libdir" &&
+
+    for f in "$cfg_dir_toolchain/$cfg_target_canonical/$libdir/"{libgcc_s,libstdc++}.so*; do
         base="$(basename $f)"
 
         if [ $(echo "$base" | grep '\.py' 2> /dev/null) ]; then

rules/gdb/common.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '7.8.2'
+    '7.10.1'
 )
 
 url=\
@@ -10,5 +10,5 @@ url=\
 
 md5=\
 (
-    'a80cf252ed2e775d4e4533341bbf2459'
+    '39e654460c9cdd80200a29ac020cfe11'
 )

rules/linux/default.bash

@@ -201,11 +201,18 @@ target_install()
         DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
         modules_install
 
-    $cmd_make \
+    echo $cfg_sys_family
-        CROSS_COMPILE="$cfg_target_canonical-" \
+    if [[ $cfg_sys_family == *rpi* ]]; then
-        ARCH="$cfg_target_linux" \
+        echo "RPI family, no need of firmware_install"
-        INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
+        sleep 2
-        KBUILD_VERBOSE=1 \
+    else
-        DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
+        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.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/linux/v3_14.bash

@@ -129,14 +129,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
 
@@ -145,7 +143,6 @@ build()
         $cmd_make \
             CROSS_COMPILE=$cfg_target_canonical- \
             ARCH=$cfg_target_linux \
-            DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
             zImage || return 1
     fi
 
@@ -154,7 +151,6 @@ build()
         $cmd_make \
             CROSS_COMPILE=$cfg_target_canonical- \
             ARCH=$cfg_target_linux \
-            DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
             dtbs || return 1
     fi
 
@@ -199,7 +195,6 @@ 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 \
@@ -207,6 +202,5 @@ target_install()
         ARCH="$cfg_target_linux" \
         INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
         KBUILD_VERBOSE=1 \
-        DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
         firmware_install
 }

rules/lpg/default.bash

@@ -10,7 +10,13 @@ url=\
 
 md5=\
 (
-    "beb0f3b8be474868b074dca66ced5b48"
+    "d71e2f282372a5cb1021d9e457a3d53f"
+)
+
+requires=\
+(
+    'bison/host'
+    'flex/host'
 )
 
 configure()
@@ -20,7 +26,10 @@ configure()
 
 build()
 {
-    $cmd_make
+    $cmd_make \
+	BISON="$cfg_dir_toolchain/bin/bison" \
+	FLEX="$cfg_dir_toolchain/bin/flex"
+    
 }
 
 target_install()

rules/memtest86+/default.bash

@@ -0,0 +1,32 @@
+version=\
+(
+    "5.01"
+)
+
+url=\
+(
+    "http://www.lsts.pt/glued/memtest86+-$version.tar.gz"
+)
+
+md5=\
+(
+    "035b85f2edabc9b4a6b0cf6c9c3acf50"
+)
+
+maintainer=\
+(
+    'Tiago Sá Marques <tsmarques@fe.up.pt>'
+)
+
+build()
+{
+    $cmd_make \
+        CC=$cmd_target_cc \
+        CXX=$cmd_target_cxx
+}
+
+target_install()
+{
+    $cmd_cp ./memtest.bin $cfg_dir_rootfs/boot/
+    tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+}

rules/memtest86+/fs/usr/bin/start-memtest

@@ -0,0 +1,14 @@
+#! /bin/sh
+
+echo "Starting memtest in 10 seconds (requires reboot), Ctrl-C to cancel..."
+for r in 0 1 2 3 4 5 6 7 8 9; do
+    printf "."
+    sleep 1
+done
+
+mount -o remount,rw /
+extlinux -o "memtest" /boot/extlinux/
+mount -o remount,ro /
+
+echo "* Rebooting now"
+reboot

rules/openssh/default.bash

@@ -30,6 +30,7 @@ configure()
         --target="$cfg_target_canonical" \
         --host="$cfg_target_canonical" \
         --build="$cfg_host_canonical" \
+        --with-privsep-path=$cfg_dir_rootfs/var/empty \
         --disable-strip
         
 }

rules/perf/default.bash

@@ -0,0 +1,46 @@
+version=\
+(
+    "3.19"
+)
+
+url=\
+(
+       "https://www.kernel.org/pub/linux/kernel/v3.x/linux-$version.tar.xz"
+)
+
+requires=\
+(
+    'flex/host'
+    'bison/host'
+    'zlib/default'
+)
+
+# v3.19
+md5=\
+(
+       'd3fc8316d4d4d04b65cbc2d70799e763'
+)
+
+#3.14.63
+# md5=('6cf8a6b23849f47f511e0e46cfdb6392')
+
+build()
+{
+    
+    cd ../linux-$version/
+    $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" \
+	NO_LIBELF=1 \
+	LDFLAGS=-static \
+	-C "./tools/perf/"
+}
+
+target_install()
+{
+    $cmd_cp ../linux-$version/tools/perf/perf \
+	    $cfg_dir_rootfs/usr/bin/
+}

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/syslinux/extlinux.conf

@@ -1,3 +1,6 @@
 LABEL linux
    KERNEL /boot/kernel
    APPEND rootwait root=$cfg_kernel_boot_dev rootfstype=ext2 ro $cfg_kernel_extra_args
+
+LABEL memtest
+   LINUX /boot/memtest.bin

systems/lauv-aux-rpi/lauv-blue.cfg

@@ -0,0 +1,6 @@
+cfg_hostname='lauv-blue'
+cfg_eth_ext_ip='10.0.2.55'
+cfg_eth_ext_mk='255.255.0.0'
+cfg_eth_ext_gw='10.0.0.1'
+cfg_ptpd_interface='eth0'
+cfg_services1=''

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

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

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

@@ -6,5 +6,5 @@ cfg_ptpd_interface='eth0'
 cfg_services0='network dropbear storage upgrade syslog ptpd'
 cfg_services1=''
 cfg_services2='trex'
-cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind nfs-utils rpi-boot-firmware linux/rpi libantlr3c boost europa'
+cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind nfs-utils rpi-boot-firmware linux/rpi libantlr3c boost'
 

systems/lauv-aux-rpi/lauv-xplore-2-aux.cfg

@@ -6,5 +6,5 @@ cfg_ptpd_interface='eth0'
 cfg_services0='network dropbear storage upgrade syslog ptpd'
 cfg_services1=''
 cfg_services2='trex'
-cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind nfs-utils rpi-boot-firmware linux/rpi libantlr3c boost europa'
+cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind nfs-utils rpi-boot-firmware linux/rpi libantlr3c boost'
 

systems/lauv-aux-rpi/lauv-xplore-3-aux.cfg

@@ -0,0 +1,10 @@
+cfg_hostname='lauv-xplore-3-aux'
+cfg_eth_ext_ip='10.0.10.143'
+cfg_eth_ext_mk='255.255.0.0'
+cfg_eth_ext_gw='10.0.0.1'
+cfg_ptpd_interface='eth0'
+cfg_services0='network dropbear storage upgrade syslog ptpd'
+cfg_services1=''
+cfg_services2='trex'
+cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind nfs-utils rpi-boot-firmware linux/rpi libantlr3c boost'
+

systems/lauv-aux-rpi/lauv-xplore-4-aux.cfg

@@ -0,0 +1,10 @@
+cfg_hostname='lauv-xplore-4-aux'
+cfg_eth_ext_ip='10.0.10.153'
+cfg_eth_ext_mk='255.255.0.0'
+cfg_eth_ext_gw='10.0.0.1'
+cfg_ptpd_interface='eth0'
+cfg_services0='network dropbear storage upgrade syslog ptpd'
+cfg_services1=''
+cfg_services2='trex'
+cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind nfs-utils rpi-boot-firmware linux/rpi libantlr3c boost'
+

systems/lauv-aux-rpi/lauv-xplore-5-aux.cfg

@@ -0,0 +1,10 @@
+cfg_hostname='lauv-xplore-5-aux'
+cfg_eth_ext_ip='10.0.10.163'
+cfg_eth_ext_mk='255.255.0.0'
+cfg_eth_ext_gw='10.0.0.1'
+cfg_ptpd_interface='eth0'
+cfg_services0='network dropbear storage upgrade syslog ptpd'
+cfg_services1=''
+cfg_services2='trex'
+cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind nfs-utils rpi-boot-firmware linux/rpi libantlr3c boost'
+

systems/lctr-a6xx/buv-petinga-1.cfg

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

systems/lctr-a6xx/cfg/linux-4.4.66.cfg

@@ -1182,7 +1182,7 @@ CONFIG_SCx200_ACB=y
 # PPS support
 #
 CONFIG_PPS=y
-CONFIG_PPS_DEBUG=y
+# CONFIG_PPS_DEBUG is not set
 CONFIG_NTP_PPS=y
 
 #
@@ -2030,8 +2030,6 @@ CONFIG_NLS_UTF8=y
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_HAVE_KVM_IRQFD=y
-CONFIG_VFIO_VIRQFD=y
 
 #
 # printk and dmesg options

systems/lctr-a6xx/config

@@ -4,7 +4,7 @@ cfg_services0='dropbear network storage upgrade syslog escc ptpd setserial'
 cfg_services1=''
 cfg_services2='dune'
 cfg_modules=''
-cfg_packages='coreboot-lsts emm-8p-xt-eeprom zlib dropbear rsync busybox flashrom e2fsprogs socat linux escc syslinux syslinux/host ptpd ntp uswitch pciutils bzip2'
+cfg_packages='coreboot-lsts emm-8p-xt-eeprom zlib dropbear rsync busybox flashrom e2fsprogs socat linux escc syslinux syslinux/host ptpd ntp uswitch pciutils bzip2 memtest86+'
 cfg_terminal='ttyS0'
 cfg_target_linux_kernel='arch/x86/boot/bzImage'
 cfg_ptpd_master='true'

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

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

systems/lctr-a6xx/lauv-xplore-3.cfg

@@ -0,0 +1,2 @@
+cfg_hostname='lauv-xplore-3'
+cfg_eth_ext_ip='10.0.10.140'

systems/lctr-a6xx/lauv-xplore-4.cfg

@@ -0,0 +1,2 @@
+cfg_hostname='lauv-xplore-4'
+cfg_eth_ext_ip='10.0.10.150'

systems/lctr-a6xx/lauv-xplore-5.cfg

@@ -0,0 +1,2 @@
+cfg_hostname='lauv-xplore-5'
+cfg_eth_ext_ip='10.0.10.160'

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

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

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

@@ -4,4 +4,4 @@ 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 boost jansson czmq zeromq lpg"
+cfg_packages="$cfg_packages boost jansson czmq zeromq"

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

@@ -4,4 +4,4 @@ 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 boost jansson czmq zeromq lpg"
+cfg_packages="$cfg_packages boost jansson czmq zeromq"

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

@@ -4,4 +4,4 @@ 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 boost jansson czmq zeromq lpg"
+cfg_packages="$cfg_packages boost jansson czmq zeromq"

systems/lctr-b2xx/patches/linux/4.4.66/00-lctr-b2xx-dts.patch

@@ -1,14 +1,13 @@
-diff -Nru linux-3.13.1/arch/arm/boot/dts/Makefile linux-3.13.1.rasm/arch/arm/boot/dts/Makefile
+--- linux-4.4.66/arch/arm/boot/dts/Makefile	2017-09-25 13:07:10.353013618 +0100
---- linux-3.13.1/arch/arm/boot/dts/Makefile	2014-01-29 13:06:37.000000000 +0000
++++ linux-4.4.66.tsm/arch/arm/boot/dts/Makefile	2017-09-25 13:11:13.523693878 +0100
-+++ linux-3.13.1.rasm/arch/arm/boot/dts/Makefile	2014-02-01 06:53:43.968486026 +0000
+@@ -463,6 +463,7 @@
-@@ -198,6 +198,7 @@
+ 	am335x-evm.dtb \
  	am335x-evmsk.dtb \
- 	am335x-bone.dtb \
- 	am335x-boneblack.dtb \
-+	am335x-lctr-b2xx.dtb \
  	am335x-nano.dtb \
- 	am335x-base0033.dtb \
++	am335x-lctr-b2xx.dtb \
- 	am3517-evm.dtb \
+ 	am335x-pepper.dtb \
+ 	am335x-lxm.dtb \
+ 	am335x-chiliboard.dtb \
 diff -Nru linux-3.13.1/arch/arm/boot/dts/am335x-lctr-b2xx.dts linux-3.13.1.rasm/arch/arm/boot/dts/am335x-lctr-b2xx.dts
 --- linux-3.13.1/arch/arm/boot/dts/am335x-lctr-b2xx.dts	1970-01-01 01:00:00.000000000 +0100
 +++ linux-3.13.1.rasm/arch/arm/boot/dts/am335x-lctr-b2xx.dts	2014-02-01 06:51:48.273816483 +0000

systems/lctr-rpi/titan.cfg

@@ -0,0 +1,4 @@
+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

@@ -0,0 +1,9 @@
+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'