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

This reverts commit 8ff2efbf62.

architectures/arm-1176.cfg

@@ -2,5 +2,5 @@ cfg_target_canonical="armv11-$cfg_glued_vendor-linux-gnueabi"
 cfg_target_linux='arm'
 cfg_target_uboot_arch='arm'
 cfg_target_gcc_flags='-O2 -pipe -funit-at-a-time -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=softfp -mfpu=vfpv3'
-cfg_target_gcc_configure_flags='--with-arch=armv7-a --with-cpu=arm1176jzf-s --with-tune=arm1176jzf-s --with-fpu=vfpv3 --with-float=softfp'
+cfg_target_gcc_configure_flags='--with-arch=armv7-a --with-mcpu=arm1176jzf-s --with-mtune=arm1176jzf-s --with-fpu=vfpv3 --with-float=softfp'
 cfg_target_ar_flags='elf32-littlearm'

architectures/arm926ej-s.cfg

@@ -1,4 +1,4 @@
 cfg_target_canonical="armv5te-$cfg_glued_vendor-linux-gnueabi"
 cfg_target_linux='arm'
 cfg_target_gcc_flags='-O2 -pipe -funit-at-a-time -mtune=arm926ej-s -mfloat-abi=soft'
-cfg_target_gcc_configure_flags='--with-arch=armv5te --with-tune=arm926ej-s --with-float=soft'
+cfg_target_gcc_configure_flags='--with-arch=armv5te --with-mtune=arm926ej-s --with-float=soft'

architectures/atom.cfg

@@ -1,4 +1,4 @@
 cfg_target_canonical="atom-$cfg_glued_vendor-linux-gnu"
 cfg_target_linux='x86'
 cfg_target_linux_kernel='arch/x86/boot/bzImage'
-cfg_target_gcc_configure_flags='--with-arch=atom --with-cpu=atom --with-tune=atom'
+cfg_target_gcc_configure_flags='--with-arch=atom --with-mcpu=atom --with-mtune=atom'

architectures/atom64.cfg

@@ -1,6 +1,6 @@
 cfg_target_canonical="atom64-$cfg_glued_vendor-linux-gnu"
 cfg_target_linux='x86'
 cfg_target_gcc_flags='-O2 -pipe -march=atom -funit-at-a-time'
-cfg_target_gcc_configure_flags='--with-cpu=x86-64 --with-tune=atom'
+cfg_target_gcc_configure_flags='--with-mcpu=x86-64 --with-mtune=atom'
 cfg_target_linux_kernel='arch/x86/boot/bzImage'
 cfg_target_lib64='yes'

architectures/cortex-a8-hardfp.cfg

@@ -2,5 +2,5 @@ cfg_target_canonical="armv7-$cfg_glued_vendor-linux-gnueabihf"
 cfg_target_linux='arm'
 cfg_target_uboot_arch='arm'
 cfg_target_gcc_flags='-O2 -pipe -funit-at-a-time -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=hard -mfpu=vfpv3'
-cfg_target_gcc_configure_flags='--with-arch=armv7-a --with-cpu=cortex-a8 --with-tune=cortex-a8 --with-fpu=vfpv3 --with-float=hard'
+cfg_target_gcc_configure_flags='--with-arch=armv7-a --with-mcpu=cortex-a8 --with-mtune=cortex-a8 --with-fpu=vfpv3 --with-float=hard'
 cfg_target_ar_flags='elf32-littlearm'

architectures/cortex-a8.cfg

@@ -2,5 +2,5 @@ cfg_target_canonical="armv7-$cfg_glued_vendor-linux-gnueabi"
 cfg_target_linux='arm'
 cfg_target_uboot_arch='arm'
 cfg_target_gcc_flags='-O2 -pipe -funit-at-a-time -mcpu=cortex-a8 -mtune=cortex-a8 -mfloat-abi=softfp -mfpu=vfpv3'
-cfg_target_gcc_configure_flags='--with-arch=armv7-a --with-cpu=cortex-a8 --with-tune=cortex-a8 --with-fpu=vfpv3 --with-float=softfp'
+cfg_target_gcc_configure_flags='--with-arch=armv7-a --with-mcpu=cortex-a8 --with-mtune=cortex-a8 --with-fpu=vfpv3 --with-float=softfp'
 cfg_target_ar_flags='elf32-littlearm'

architectures/cortex-a9-hardfp.cfg

@@ -2,5 +2,5 @@ cfg_target_canonical="armv7-$cfg_glued_vendor-linux-gnueabihf"
 cfg_target_linux='arm'
 cfg_target_uboot_arch='arm'
 cfg_target_gcc_flags='-O2 -pipe -funit-at-a-time -mcpu=cortex-a9 -mtune=cortex-a9 -mfloat-abi=hard -mfpu=vfpv3'
-cfg_target_gcc_configure_flags='--with-arch=armv7-a --with-cpu=cortex-a9 --with-tune=cortex-a9 --with-fpu=vfpv3 --with-float=hard'
+cfg_target_gcc_configure_flags='--with-arch=armv7-a --with-mcpu=cortex-a9 --with-mtune=cortex-a9 --with-fpu=vfpv3 --with-float=hard'
 cfg_target_ar_flags='elf32-littlearm'

architectures/geode.cfg

@@ -1,3 +1,3 @@
 cfg_target_canonical="geode-$cfg_glued_vendor-linux-gnu"
 cfg_target_linux='x86'
-cfg_target_gcc_configure_flags='--with-arch=geode --with-cpu=geode --with-tune=geode'
+cfg_target_gcc_configure_flags='--with-arch=geode --with-mcpu=geode --with-mtune=geode'

architectures/i586.cfg

@@ -1,5 +1,5 @@
 cfg_target_canonical="i586-$cfg_glued_vendor-linux-gnu"
 cfg_target_linux='x86'
-cfg_target_gcc_configure_flags='--with-arch=i586 --with-cpu=i586 --with-tune=i586'
+cfg_target_gcc_configure_flags='--with-arch=i586 --with-mcpu=i586 --with-mtune=i586'
 cfg_target_gcc_flags='-O2 -pipe -march=i586 -funit-at-a-time'
 cfg_target_glibc_configure_flags='--with-cpu=i586'

architectures/i686.cfg

@@ -1,6 +1,6 @@
 cfg_target_canonical="i686-$cfg_glued_vendor-linux-gnu"
 cfg_target_linux='x86'
 cfg_target_gcc_flags='-O2 -pipe -march=i686 -funit-at-a-time'
-cfg_target_gcc_configure_flags='--with-cpu=i686'
+cfg_target_gcc_configure_flags='--mwith-cpu=i686'
-cfg_target_glibc_configure_flags='--with-cpu=i686'
+cfg_target_glibc_configure_flags='--with-mcpu=i686'
 cfg_target_linux_kernel='arch/x86/boot/bzImage'

architectures/mips32r2.cfg

@@ -1,5 +1,5 @@
 cfg_target_canonical="mipsisa32r2-$cfg_glued_vendor-linux-gnu"
 cfg_target_linux='mips'
 cfg_target_gcc_flags='-O2 -pipe -funit-at-a-time -mabi=32 -mips32r2 -mtune=mips32r2 -msoft-float'
-cfg_target_gcc_configure_flags='--with-abi=32 --with-tune=mips32r2 --with-float=soft'
+cfg_target_gcc_configure_flags='--with-abi=32 --with-mtune=mips32r2 --with-float=soft'
 cfg_target_glibc_configure_flags='--without-fp'

architectures/xscale-iwmmxt.cfg

@@ -1,4 +1,4 @@
 cfg_target_canonical="armv5-$cfg_glued_vendor-linux-gnueabi"
 cfg_target_linux='arm'
 cfg_target_gcc_flags='-O2 -pipe -funit-at-a-time -mcpu=iwmmxt -mtune=iwmmxt -mfloat-abi=soft'
-cfg_target_gcc_configure_flags='--with-arch=iwmmxt --with-cpu=iwmmxt --with-tune=iwmmxt --with-float=soft'
+cfg_target_gcc_configure_flags='--with-arch=iwmmxt --with-mcpu=iwmmxt --with-mtune=iwmmxt --with-float=soft'

architectures/xscale.cfg

@@ -1,4 +1,4 @@
 cfg_target_canonical="armv5-$cfg_glued_vendor-linux-gnueabi"
 cfg_target_linux='arm'
 cfg_target_gcc_flags='-O2 -pipe -funit-at-a-time -mtune=xscale -mfloat-abi=soft'
-cfg_target_gcc_configure_flags='--with-arch=armv5te --with-tune=xscale --with-float=soft'
+cfg_target_gcc_configure_flags='--with-arch=armv5te --with-mtune=xscale --with-float=soft'

docker/Dockerfile

@@ -27,12 +27,22 @@ 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 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 kmod
+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 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,12 @@ 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."

mkdisk.bash

@@ -70,7 +70,7 @@ create_part_xboot()
     nfo2 "Populating filesystem"
     cmd_mount vfat "$part_dev" || die
 
-    for f in MLO u-boot.img uEnv.txt; do
+    for f in MLO u-boot.img uEnv.txt kernel; do
         if [ -f "$cfg_sys_family/rootfs/boot/$f" ]; then
             nfo2 installing $f to boot partition
             cp "$cfg_sys_family/rootfs/boot/$f" mount || die

mkupdate.bash

@@ -1,68 +0,0 @@
-#! /bin/bash
-###########################################################################
-# GLUED: GNU/Linux Uniform Environment Distribution                       #
-# 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    #
-# it under the terms of the GNU General Public License as published by    #
-# the Free Software Foundation; either version 2 of the License, or (at   #
-# your option) any later version.                                         #
-#                                                                         #
-# This program is distributed in the hope that it will be useful, but     #
-# WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       #
-# General Public License for more details.                                #
-#                                                                         #
-# You should have received a copy of the GNU General Public License       #
-# along with this program; if not, write to the Free Software             #
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA           #
-# 02110-1301 USA.                                                         #
-###########################################################################
-# Author: Tiago Marques                                                   #
-###########################################################################
-
-update_tool()
-{
-    rsync -v "$1" root@"$2":/opt/"$cfg_glued_vendor"/glued/
-    if [ $? -eq 0 ]; then
-        return 0
-    fi
-
-    scp "$1" root@"$2":/opt/"$cfg_glued_vendor"/glued/
-    if [ $? -eq 0 ]; then
-        return 0
-    fi
-
-    return 1
-}
-
-# Check command line arguments.
-if [ $# -lt 1 ]; then
-    echo "Usage: $0 <config>"
-    exit 1
-fi
-
-# Read system configuration file.
-if ! [ -f "$1" ]; then
-    echo -e "\e[1;31mERROR: invalid configuration file '$1'\e[0m"
-    exit 1
-fi
-
-# Read system configuration file.
-source "$1"
-
-if [ ! -f "$cfg_rootfs_tar" ];
-then
-    echo -e "\e[1;31mERROR: You should run ./pkrootfs $1\e[0m"
-    exit 1
-fi
-
-# check for dirty repo
-if [[ "$cfg_glued_git_version" =~ .*-dirty$ ]]
-then
-    echo -e "\e[1;31mThis glued's version is dirty\e[0m"
-fi
-
-# send package to the system
-update_tool "$cfg_rootfs_tar" "$cfg_eth_ext_ip"

rules/base/host.bash

@@ -26,5 +26,4 @@ requires=\
     'parted/host'
     'dosfstools/host'
     'e2fsprogs/host'
-    'cmake/host'
 )

rules/binutils/cross.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '2.25.1'
+    '2.28'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    'ac493a78de4fee895961d025b7905be4'
+    '9e8340c96626b469a603c15c9d843727'
 )
 
 maintainer=\

rules/czmq/default.bash

@@ -1,52 +0,0 @@
-version=\
-(
-    "3.0.2"
-)
-
-url=\
-(
-    "https://github.com/zeromq/czmq/archive/v$version.tar.gz"
-)
-
-md5=\
-(
-    "23e9885f7ee3ce88d99d0425f52e9be1"
-)
-
-configure()
-{
-    ./autogen.sh && \
-    ./configure \
-        --prefix="${cfg_dir_toolchain_sysroot}/usr" \
-        --target="$cfg_target_canonical" \
-        --host="$cfg_target_canonical" \
-        --build="$cfg_host_canonical"
-}
-
-build()
-{
-    $cmd_make
-}
-
-host_install()
-{
-    $cmd_make install
-}
-
-requires=\
-(
-    'libtool/host'
-    'zeromq'
-)
-
-target_install()
-{
-  # Libs:
-  for f in "$cfg_dir_toolchain_sysroot/usr/lib/"libczmq.*; do
-    if [ -L "$f" ]; then
-      $cmd_cp "$f" "$cfg_dir_rootfs/usr/lib"
-    else
-      $cmd_target_strip -v "$f" -o "$cfg_dir_rootfs/usr/lib/$(basename "$f")"
-    fi
-  done
-}

rules/dune/default.bash

@@ -1,37 +0,0 @@
-version=\
-(
-    'master'
-)
-
-requires=\
-(
-    'cmake/host'
-)
-
-download()
-{
-    git clone "git@github.com:LSTS/dune.git" dune &&
-        cd dune && git checkout "$version" && cd - &&
-        git clone "git@git.lsts.pt:dune-private.git" dune/private &&
-        cd dune/private && git checkout "$version" && cd -
-}
-
-configure()
-{
-    $cmd_mkdir build &&
-        cd build &&
-        cmake \
-            -DCMAKE_INSTALL_PREFIX="$cfg_dir_toolchain_sysroot/usr" \
-            -DCROSS="$cmd_target_cc" \
-            ../dune
-}
-
-build()
-{
-    $cmd_make -C build
-}
-
-host_install()
-{
-    $cmd_make -C build install
-}

rules/exiv2/default.bash

@@ -55,3 +55,4 @@ target_install()
   done
 }
 
+

rules/gcc/common.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '4.9.3'
+    '5.4.0'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    '6f831b4d251872736e8e9cc09746f327'
+    '4c626ac2a83ef30dfb9260e6f59c2b30'
 )
 
 build_dir=$pkg_var

rules/gcc/cross.bash

@@ -49,15 +49,10 @@ host_install()
 
 target_install()
 {
-    libdir=lib
-    if [ -d "$cfg_dir_toolchain/$cfg_target_canonical/lib64" ]; then
-        libdir=lib64
-    fi
-
     $cmd_mkdir \
-        "$cfg_dir_rootfs/usr/$libdir" &&
+        "$cfg_dir_rootfs/usr/lib" &&
 
-    for f in "$cfg_dir_toolchain/$cfg_target_canonical/$libdir/"{libgcc_s,libstdc++}.so*; do
+    for f in "$cfg_dir_toolchain/$cfg_target_canonical/lib/"{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.10.1'
+    '7.8.2'
 )
 
 url=\
@@ -10,5 +10,5 @@ url=\
 
 md5=\
 (
-    '39e654460c9cdd80200a29ac020cfe11'
+    'a80cf252ed2e775d4e4533341bbf2459'
 )

rules/glibc/common.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '2.22'
+    '2.24'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    'e51e02bf552a0a1fbbdc948fb2f5e83c'
+    '97dc5517f92016f3d70d83e3162ad318'
 )
 
 maintainer=\

rules/gmp/host.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '5.0.4'
+    '6.1.2'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    '50c3edcb7c9438e04377ee9a1a061b79'
+    '8ddbb26dc3bd4e2302984debba1406a5'
 )
 
 maintainer=\

rules/jansson/default.bash

@@ -1,45 +0,0 @@
-version=\
-(
-    "2.7"
-)
-
-url=\
-(
-    "http://www.digip.org/jansson/releases/jansson-2.7.tar.gz"
-)
-
-md5=\
-(
-    "3a106a465bbb77637550b422f5b262ef"
-)
-
-configure()
-{
-    ./configure \
-        --prefix="${cfg_dir_toolchain_sysroot}/usr" \
-        --target="$cfg_target_canonical" \
-        --host="$cfg_target_canonical" \
-        --build="$cfg_host_canonical"
-}
-
-build()
-{
-    $cmd_make
-}
-
-host_install()
-{
-    $cmd_make install
-}
-
-target_install()
-{
-  # Libs:
-  for f in "$cfg_dir_toolchain_sysroot/usr/lib/"libjansson.*; do
-    if [ -L "$f" ]; then
-      $cmd_cp "$f" "$cfg_dir_rootfs/usr/lib"
-    else
-      $cmd_target_strip -v "$f" -o "$cfg_dir_rootfs/usr/lib/$(basename "$f")"
-    fi
-  done
-}

rules/libav/default.bash

@@ -15,9 +15,10 @@ md5=\
 
 configure()
 {
+    $cmd_mkdir build
     ./configure \
         --sysroot="$cfg_dir_toolchain_sysroot" \
-        --prefix="$cfg_dir_rootfs/usr" \
+        --prefix="$cfg_dir_builds/libav/libav-$version/build/" \
         --cross-prefix="$cfg_target_canonical-" \
         --target-os="linux" \
         --enable-memalign-hack \
@@ -32,8 +33,14 @@ build()
     $cmd_make
 }
 
+host_install()
+{
+    $cmd_make install
+    $cmd_cp -r "build/"*        "$cfg_dir_toolchain_sysroot/usr/"
+}
+
 target_install()
 {
-    $cmd_make \
+    $cmd_cp -r "build/"*        "$cfg_dir_rootfs/usr/"
-        install
+
 }

rules/libdc1394/default.bash

@@ -19,6 +19,7 @@ configure()
         --prefix="$cfg_dir_toolchain_sysroot/usr" \
         --target="$cfg_target_canonical" \
         --host="$cfg_target_canonical" \
+        --disable-examples \
         --build="$cfg_host_canonical"
 }
 

rules/libqmi/default.bash

@@ -1,55 +0,0 @@
-version=\
-(
-    '1.12.8'
-)
-
-url=\
-(
-    "https://www.freedesktop.org/software/libqmi/libqmi-$version.tar.xz"
-)
-
-md5=\
-(
-    'fcad1a581ee9df8de5a753616dc27adf'
-)
-
-maintainer=\
-(
-    'Tiago Sá Marques <tsmarques@fe.up.pt>'
-)
-
-requires=\
-(
-    'glib/default'
-    'libffi/default'
-)
-
-configure()
-{
-    export PKG_CONFIG="${cfg_dir_toolchain}/bin/pkg-config"
-    export PKG_CONFIG_PATH="$cfg_dir_toolchain_sysroot/usr/lib/pkgconfig"
-    ./configure \
-        --prefix="$cfg_dir_rootfs/usr" \
-        --target="$cfg_target_canonical" \
-        --host="$cfg_target_canonical" \
-        --build="$cfg_host_canonical" \
-  	--with-sysroot="$cfg_dir_toolchain_sysroot" \
-	--without-udev
-}
-
-build()
-{
-    export PKG_CONFIG="${cfg_dir_toolchain}/bin/pkg-config"
-    export PKG_CONFIG_PATH="$cfg_dir_toolchain_sysroot/usr/lib/pkgconfig"
-    $cmd_make CC=$cmd_target_cc
-}
-
-target_install()
-{
-    $cmd_make install
-    $cmd_cp "$cfg_dir_toolchain_sysroot"/usr/lib/libffi.* "$cfg_dir_rootfs"/usr/lib/
-    $cmd_cp "$cfg_dir_toolchain_sysroot"/usr/lib/libgio* "$cfg_dir_rootfs"/usr/lib/
-    $cmd_cp "$cfg_dir_toolchain_sysroot"/usr/lib/libgmodule* "$cfg_dir_rootfs"/usr/lib/
-    $cmd_cp "$cfg_dir_toolchain_sysroot"/usr/lib/libgobject* "$cfg_dir_rootfs"/usr/lib/
-    $cmd_cp "$cfg_dir_toolchain_sysroot"/usr/lib/libglib* "$cfg_dir_rootfs"/usr/lib/
-}

rules/libraw1394/default.bash

@@ -0,0 +1,41 @@
+version=\
+(
+    '2.0.5'
+)
+
+url=\
+(
+    "http://downloads.sourceforge.net/libraw1394/libraw1394-$version.tar.gz"
+)
+
+md5=\
+(
+    '1db64231c78540c32859b591cb8b40cf'
+)
+
+configure()
+{
+    "../libraw1394-$version/configure" \
+        --prefix="$cfg_dir_toolchain_sysroot/usr" \
+        --target="$cfg_target_canonical" \
+        --host="$cfg_target_canonical" \
+        --disable-examples \
+        --build="$cfg_host_canonical"
+}
+
+build()
+{
+    $cmd_make
+}
+
+host_install()
+{
+    $cmd_make install
+}
+
+target_install()
+{
+    for f in "$cfg_dir_toolchain_sysroot/usr/lib/"libraw1394*so*; do
+        $cmd_target_strip "$f" -o "$cfg_dir_rootfs/lib/$(basename "$f")"
+    done
+}

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,6 +198,7 @@ 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 \
@@ -201,5 +206,6 @@ 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/linux/v3_14.bash

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

@@ -1,38 +0,0 @@
-version=\
-(
-	   "1.2"
-)
-
-url=\
-(
-    "http://lsts.pt/glued/lpg-$version.tar.gz"
-)
-
-md5=\
-(
-    "d71e2f282372a5cb1021d9e457a3d53f"
-)
-
-requires=\
-(
-    'bison/host'
-    'flex/host'
-)
-
-configure()
-{
-    ./configure "$cfg_target_canonical-gcc"
-}
-
-build()
-{
-    $cmd_make \
-	BISON="$cfg_dir_toolchain/bin/bison" \
-	FLEX="$cfg_dir_toolchain/bin/flex"
-    
-}
-
-target_install()
-{
-    $cmd_cp "lpg" "$cfg_dir_rootfs/usr/bin"
-}

rules/memtest86+/default.bash

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

@@ -1,14 +0,0 @@
-#! /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/mpc/host.bash

@@ -1,16 +1,16 @@
 version=\
 (
-    "0.9"
+    "1.0.2"
 )
 
 url=\
 (
-    "http://www.multiprecision.org/mpc/download/mpc-$version.tar.gz"
+    "https://ftp.gnu.org/gnu/mpc/mpc-$version.tar.gz"
 )
 
 md5=\
 (
-    "0d6acab8d214bd7d1fbbc593e83dd00d"
+    "68fadff3358fb3e7976c7a398a0af4c3"
 )
 
 maintainer=\

rules/mpfr/host.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '3.1.3'
+    '3.1.5'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    '5fdfa3cfa5c86514ee4a241a1affa138'
+    'b1d23a55588e3b2a13e3be66bc69fd8d'
 )
 
 maintainer=\

rules/netcat/default.bash

@@ -0,0 +1,52 @@
+version=\
+(
+    "110"
+)
+
+url=\
+(
+    "https://kent.dl.sourceforge.net/project/nc$version/unix%20netcat%201.10%20by%20_Hobbit_/%5BUnnamed%20release%5D/nc$version.tgz"
+)
+
+md5=\
+(
+    "402632f2fe01c169ff19a0ad6e9d608c"
+)
+
+post_unpack()
+{
+  cd "../netcat-$version"
+  mv ../data .
+  mv ../generic.h .
+  mv ../Makefile .
+  mv ../netcat.blurb .
+  mv ../netcat.c .
+  mv ../README .
+  mv ../Changelog .
+  mv ../scripts .
+  mv ../stupidh .
+
+  patches=$(ls "$pkg_dir"/patches/*.patch)
+  if [ -n "$patches" ]; then
+      cat $patches | patch -p1
+  fi
+}
+
+build()
+{
+  make nc CC="$cmd_target_cc"
+}
+
+host_install()
+{
+  $cmd_cp nc "${cfg_dir_toolchain_sysroot}/usr/bin/"
+  $cmd_mkdir "${cfg_dir_toolchain_sysroot}/usr/share/bin/"
+  $cmd_cp scripts/* "${cfg_dir_toolchain_sysroot}/usr/share/bin/"
+}
+
+target_install()
+{
+  $cmd_target_strip nc -o "$cfg_dir_rootfs/usr/bin/nc"
+  $cmd_mkdir ${cfg_dir_rootfs}/usr/share/bin/
+  $cmd_cp scripts/* "${cfg_dir_rootfs}/usr/share/bin/"
+}

rules/netcat/patches/res_init.patch

@@ -0,0 +1,11 @@
+--- a/netcat.c	2017-05-25 14:39:05.517314469 +0200
++++ b/netcat_patch.c	2017-05-25 14:39:00.549218618 +0200
+@@ -1316,7 +1316,7 @@
+
+ #ifdef HAVE_BIND
+ /* can *you* say "cc -yaddayadda netcat.c -lresolv -l44bsd" on SunLOSs? */
+-  res_init();
++//  res_init();
+ #endif
+ /* I was in this barbershop quartet in Skokie IL ... */
+ /* round up the usual suspects, i.e. malloc up all the stuff we need */

rules/opencv/default.bash

@@ -15,15 +15,22 @@ md5=\
 
 requires=\
 (
-    'cmake/host'
     'ffmpeg/default'
+    'cmake/host'
 )
 
 maintainer=\
 (
     'Renato Caldas <rmsc@fe.up.pt>'
+    'Pedro Gonçalves <pedro@fe.up.pt>'
 )
 
+post_unpack()
+{
+    wget "http://lsts.pt/glued/tbb43_20141204oss_src.tgz"
+    mv tbb43_20141204oss_src.tgz "3rdparty/tbb/"
+}
+
 configure()
 {
     LINKER_ADDED_FLAGS="-Wl,-rpath,${cfg_dir_rootfs}/usr/lib"
@@ -31,26 +38,28 @@ configure()
     mkdir -p ../build
     cd ../build
     ${cfg_dir_toolchain}/usr/local/bin/cmake \
-        -DCMAKE_SYSTEM_NAME="Linux" \
+    -DCMAKE_SYSTEM_NAME="Linux" \
-        -DCMAKE_SYSTEM_PROCESSOR="$cfg_architecture" \
+    -DCMAKE_SYSTEM_PROCESSOR="$cfg_architecture" \
-	-DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_FIND_ROOT_PATH="${cfg_dir_toolchain_sysroot}/usr ${cfg_dir_rootfs}/usr" \
+    -DCMAKE_FIND_ROOT_PATH="${cfg_dir_toolchain_sysroot}/usr ${cfg_dir_rootfs}/usr" \
-        -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
+    -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
-	-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
+    -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
-	-DCMAKE_C_COMPILER="${cmd_target_cc}" \
+    -DCMAKE_C_COMPILER="${cmd_target_cc}" \
-	-DCMAKE_CXX_COMPILER="${cmd_target_cxx}" \
+    -DCMAKE_CXX_COMPILER="${cmd_target_cxx}" \
-	-DCMAKE_C_FLAGS="${cfg_target_gcc_flags}" \
+    -DCMAKE_C_FLAGS="${cfg_target_gcc_flags}" \
-	-DCMAKE_SHARED_LINKER_FLAGS="${LINKER_ADDED_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS}" \
+    -DCMAKE_SHARED_LINKER_FLAGS="${LINKER_ADDED_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS}" \
-	-DCMAKE_MODULE_LINKER_FLAGS="${LINKER_ADDED_FLAGS} ${CMAKE_MODULE_LINKER_FLAGS}" \
+    -DCMAKE_MODULE_LINKER_FLAGS="${LINKER_ADDED_FLAGS} ${CMAKE_MODULE_LINKER_FLAGS}" \
-	-DCMAKE_EXE_LINKER_FLAGS="${LINKER_ADDED_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}" \
+    -DCMAKE_EXE_LINKER_FLAGS="${LINKER_ADDED_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}" \
-	-DCMAKE_INSTALL_PREFIX="${cfg_dir_toolchain_sysroot}/usr" \
+    -DCMAKE_INSTALL_PREFIX="${cfg_dir_toolchain_sysroot}/usr" \
-	-DBUILD_DOCS=OFF \
+    -DBUILD_DOCS=OFF \
-	-DBUILD_EXAMPLES=OFF \
+    -DBUILD_EXAMPLES=OFF \
-	-DBUILD_PERF_TESTS=OFF \
+    -DBUILD_PERF_TESTS=OFF \
-	-DBUILD_SHARED_LIBS=ON \
+    -DBUILD_SHARED_LIBS=ON \
-	-DBUILD_TESTS=OFF \
+    -DBUILD_TESTS=OFF \
-	-DBUILD_WITH_DEBUG_INFO=OFF \
+    -DBUILD_WITH_DEBUG_INFO=OFF \
-	../opencv-$version/
+    -DBUILD_TBB=ON \
+    -DWITH_TBB=ON \
+    ../opencv-$version/
 }
 
 build()
@@ -75,4 +84,7 @@ target_install()
             $cmd_target_strip -v "$f" -o "$cfg_dir_rootfs/usr/lib/$(basename "$f")"
         fi
     done
+
+    $cmd_cp -r "${pkg_build_dir}/../build/lib/"libtbb.so "$cfg_dir_rootfs/usr/lib/"
+    $cmd_cp -r "${pkg_build_dir}/../build/lib/"libtbb.so "$cfg_dir_toolchain_sysroot/usr/lib/"
 }

rules/openssh/default.bash

@@ -30,7 +30,6 @@ 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

@@ -1,46 +0,0 @@
-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/pointgrey/default.bash

@@ -0,0 +1,46 @@
+version=\
+(
+    "2.11.3.121"
+)
+
+url=\
+(
+    "http://lsts.pt/glued/flycapture.$version.armhf.tar.gz"
+)
+
+md5=\
+(
+    "788861351143e3279cf4522e1055e739"
+)
+
+post_unpack()
+{
+    $cmd_cp -r "../flycapture.2.11.3.121_armhf/"* "../pointgrey-$version/"
+    rm -r ../flycapture.2.11.3.121_armhf/
+}
+
+requires=\
+(
+    'libusb/default'
+    'libraw1394/default'
+    'libdc1394/default'
+)
+
+maintainer=\
+(
+    'Pedro Gonçalves <pedro@lsts.pt>'
+)
+
+host_install()
+{
+    $cmd_cp -r "lib/"*    "$cfg_dir_toolchain_sysroot/usr/lib/"
+    $cmd_cp -r "include/"* "$cfg_dir_toolchain_sysroot/usr/include/"
+}
+
+target_install()
+{
+    $cmd_mkdir "$cfg_dir_rootfs/usr/include/"
+    $cmd_cp -r "lib/"* "$cfg_dir_rootfs/usr/lib/"
+    $cmd_cp -r "include/"* "$cfg_dir_rootfs/usr/include/"
+}
+

rules/raspicam/default.bash

@@ -13,17 +13,16 @@ md5=\
   "169e62fd17d41455a42711a2f9c54fd1"
 )
 
+requires=\
+(
+    'cmake/host'
+)
+
 maintainer=\
 (
     'Pedro Gonçalves <pedro@lsts.pt>'
 )
 
-requires=\
-(
-    'uv4l/default'
-    'cmake/host'
-)
-
 configure()
 {
     LINKER_ADDED_FLAGS="-Wl,-rpath,${cfg_dir_rootfs}/usr/lib"

rules/rlwrap/default.bash

@@ -0,0 +1,44 @@
+version=\
+(
+  "0.43"
+)
+
+url=\
+(
+  "https://github.com/hanslub42/rlwrap/releases/download/v$version/rlwrap-$version.tar.gz"
+)
+
+md5=\
+(
+  "b993e83d3a292464de70719b32f83a34"
+)
+
+requires=(
+  "readline/default"
+)
+
+configure()
+{
+  ./configure \
+    --prefix="${cfg_dir_toolchain_sysroot}/usr" \
+    --target="$cfg_target_canonical" \
+    --host="$cfg_target_canonical" \
+    --build="$cfg_host_canonical"
+}
+
+build()
+{
+  $cmd_make
+}
+
+host_install()
+{
+  $cmd_make install
+}
+
+target_install()
+{
+  $cmd_cp  $cfg_dir_toolchain_sysroot/usr/share/rlwrap $cfg_dir_rootfs/usr/share/
+  $cmd_cp  $cfg_dir_toolchain_sysroot/usr/bin/rlwrap $cfg_dir_rootfs/usr/bin/
+}
+

rules/screen/default.bash

@@ -0,0 +1,59 @@
+version=\
+(
+  "4.5.0"
+)
+
+url=\
+(
+  "http://ftp.gnu.org/gnu/screen/screen-$version.tar.gz"
+)
+
+md5=\
+(
+  "a32105a91359afab1a4349209a028e31"
+)
+
+requires=\
+(
+  "ncurses/default"
+)
+
+post_unpack()
+{
+  patches=$(ls "$pkg_dir"/patches/*.patch)
+  if [ -n "$patches" ]; then
+      cat $patches | patch -p1
+  fi
+
+  autoconf
+  aclocal
+}
+
+configure()
+{
+  ./configure \
+        --target="$cfg_target_canonical" \
+        --host="$cfg_target_canonical" \
+        --build="$cfg_host_canonical" \
+        --prefix="$cfg_dir_toolchain_sysroot/usr" \
+        --enable-colors256
+}
+
+build()
+{
+  $cmd_make
+}
+
+host_install()
+{
+  $cmd_make install
+}
+
+target_install()
+{
+  $cmd_cp  $cfg_dir_toolchain_sysroot/usr/share/screen $cfg_dir_rootfs/usr/share/
+  $cmd_cp  $cfg_dir_toolchain_sysroot/usr/bin/screen-$version $cfg_dir_rootfs/usr/bin/screen
+  $cmd_cp  etc/screenrc $cfg_dir_rootfs/etc/screenrc
+}
+
+

rules/screen/patches/0001-compiler-sanity-checks.patch

@@ -0,0 +1,62 @@
+From: Maarten ter Huurne <maarten@treewalker.org>
+Date: Sat, 13 Sep 2014 10:27:27 +0200
+Subject: Removed redundant compiler sanity checks
+
+AC_PROG_CC already performs sanity checks. And unlike the removed
+checks, it does so in a way that supports cross compilation.
+
+Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
+[Ricardo: rebase on top of 4.3.1]
+Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
+---
+ configure.ac | 27 ---------------------------
+ 1 file changed, 27 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ffe2e37..27690a6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -48,31 +48,6 @@ AC_PROG_GCC_TRADITIONAL
+ AC_ISC_POSIX
+ AC_USE_SYSTEM_EXTENSIONS
+ 
+-AC_TRY_RUN(main(){exit(0);},,[
+-if test $CC != cc ; then
+-AC_NOTE(Your $CC failed - restarting with CC=cc)
+-AC_NOTE()
+-CC=cc
+-export CC
+-exec $0 $configure_args
+-fi
+-])
+-
+-AC_TRY_RUN(main(){exit(0);},,
+-exec 5>&2
+-eval $ac_link
+-AC_NOTE(CC=$CC; CFLAGS=$CFLAGS; LIBS=$LIBS;)
+-AC_NOTE($ac_compile)
+-AC_MSG_ERROR(Can't run the compiler - sorry))
+-
+-AC_TRY_RUN([
+-main()
+-{
+-  int __something_strange_();
+-  __something_strange_(0);
+-}
+-],AC_MSG_ERROR(Your compiler does not set the exit status - sorry))
+-
+ AC_PROG_AWK
+ 
+ AC_PROG_INSTALL
+@@ -1300,8 +1275,6 @@ fi
+ dnl Ptx bug workaround -- insert -lc after -ltermcap
+ test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet -lnsl -lsec -lseq"
+ 
+-AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal error. Sorry.))
+-
+ ETCSCREENRC=
+ AC_MSG_CHECKING(for the global screenrc file)
+ AC_ARG_WITH(sys-screenrc, [  --with-sys-screenrc=path to the global screenrc file], [ ETCSCREENRC="${withval}" ])
+-- 
+1.8.4.5
+

rules/screen/patches/0002-no-memcpy-fallback.patch

@@ -0,0 +1,124 @@
+From: Maarten ter Huurne <maarten@treewalker.org>
+Date: Sat, 13 Sep 2014 11:37:59 +0200
+Subject: Do not use memcpy as an alternative for bcopy/memmove
+
+The configure script runs a small test program to check whether
+memcpy can handle overlapping memory areas. However, it is not valid
+to conclude that if a single case of overlapping memory is handled
+correctly, all cases will be handled correctly.
+
+Since screen already has its own bcopy implementation as a fallback
+for the case that bcopy and memmove are unusable, removing the memcpy
+option should not break any systems.
+
+Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
+[Ricardo: rebase on top of 4.3.1]
+Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
+---
+ acconfig.h   |  3 +--
+ configure.ac | 18 +-----------------
+ os.h         |  8 ++------
+ osdef.h.in   | 10 +---------
+ 4 files changed, 5 insertions(+), 34 deletions(-)
+
+diff --git a/acconfig.h b/acconfig.h
+index 2e46985..9b0b9d4 100644
+--- a/acconfig.h
++++ b/acconfig.h
+@@ -476,7 +476,7 @@
+ #undef GETTTYENT
+ 
+ /*
+- * Define USEBCOPY if the bcopy/memcpy from your system's C library
++ * Define USEBCOPY if the bcopy from your system's C library
+  * supports the overlapping of source and destination blocks.  When
+  * undefined, screen uses its own (probably slower) version of bcopy().
+  * 
+@@ -487,7 +487,6 @@
+  * Their memove fails the test in the configure script. Sigh. (Juergen)
+  */
+ #undef USEBCOPY
+-#undef USEMEMCPY
+ #undef USEMEMMOVE
+ 
+ /*
+diff --git a/configure.ac b/configure.ac
+index 27690a6..b8e3bec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1145,7 +1145,7 @@ AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT))
+ AC_CHECKING(fdwalk)
+ AC_TRY_LINK([#include <stdlib.h>], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK))
+ 
+-AC_CHECKING(whether memcpy/memmove/bcopy handles overlapping arguments)
++AC_CHECKING(whether memmove/bcopy handles overlapping arguments)
+ AC_TRY_RUN([
+ main() {
+   char buf[10];
+@@ -1175,22 +1175,6 @@ main() {
+   exit(0); /* libc version works properly.  */
+ }], AC_DEFINE(USEMEMMOVE))
+ 
+-
+-AC_TRY_RUN([
+-#define bcopy(s,d,l) memcpy(d,s,l)
+-main() {
+-  char buf[10];
+-  strcpy(buf, "abcdefghi");
+-  bcopy(buf, buf + 2, 3);
+-  if (strncmp(buf, "ababcf", 6))
+-    exit(1);
+-  strcpy(buf, "abcdefghi");
+-  bcopy(buf + 2, buf, 3);
+-  if (strncmp(buf, "cdedef", 6))
+-    exit(1);
+-  exit(0); /* libc version works properly.  */
+-}], AC_DEFINE(USEMEMCPY))
+-
+ AC_SYS_LONG_FILE_NAMES
+ 
+ AC_MSG_CHECKING(for vsprintf)
+diff --git a/os.h b/os.h
+index e827ac9..0b41fb9 100644
+--- a/os.h
++++ b/os.h
+@@ -142,12 +142,8 @@ extern int errno;
+ # ifdef USEMEMMOVE
+ #  define bcopy(s,d,len) memmove(d,s,len)
+ # else
+-#  ifdef USEMEMCPY
+-#   define bcopy(s,d,len) memcpy(d,s,len)
+-#  else
+-#   define NEED_OWN_BCOPY
+-#   define bcopy xbcopy
+-#  endif
++#  define NEED_OWN_BCOPY
++#  define bcopy xbcopy
+ # endif
+ #endif
+ 
+diff --git a/osdef.h.in b/osdef.h.in
+index 8687b60..e4057a0 100644
+--- a/osdef.h.in
++++ b/osdef.h.in
+@@ -58,16 +58,8 @@ extern int   bcmp __P((char *, char *, int));
+ extern int   killpg __P((int, int));
+ #endif
+ 
+-#ifndef USEBCOPY
+-# ifdef USEMEMCPY
+-extern void  memcpy __P((char *, char *, int));
+-# else
+-#  ifdef USEMEMMOVE
++#if defined(USEMEMMOVE) && !defined(USEBCOPY)
+ extern void  memmove __P((char *, char *, int));
+-#  else
+-extern void  bcopy __P((char *, char *, int));
+-#  endif
+-# endif
+ #else
+ extern void  bcopy __P((char *, char *, int));
+ #endif
+-- 
+1.8.4.5
+

rules/screen/patches/0003-cross-compilation-AC_TRY_RUN.patch

@@ -0,0 +1,125 @@
+From: Maarten ter Huurne <maarten@treewalker.org>
+Date: Sat, 13 Sep 2014 12:04:41 +0200
+Subject: Provide cross compilation alternatives for all AC_TRY_RUN uses
+
+Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
+[Ricardo: rebase on top of 4.3.1]
+Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
+---
+ configure.ac | 30 +++++++++++++++++++-----------
+ 1 file changed, 19 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b8e3bec..c4b7cd4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -348,7 +348,8 @@ main()
+   exit(0);
+ }
+ ], AC_NOTE(- your fifos are usable) fifo=1,
+-AC_NOTE(- your fifos are not usable))
++AC_NOTE(- your fifos are not usable),
++AC_NOTE(- skipping check because we are cross compiling; assuming fifos are usable) fifo=1)
+ rm -f /tmp/conftest*
+ 
+ if test -n "$fifo"; then
+@@ -396,7 +397,8 @@ main()
+   exit(0);
+ }
+ ], AC_NOTE(- your implementation is ok), 
+-AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1)
++AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1,
++AC_NOTE(- skipping check because we are cross compiling; assuming fifo implementation is ok))
+ rm -f /tmp/conftest*
+ fi
+ 
+@@ -458,7 +460,8 @@ main()
+   exit(0);
+ }
+ ], AC_NOTE(- your sockets are usable) sock=1,
+-AC_NOTE(- your sockets are not usable))
++AC_NOTE(- your sockets are not usable),
++AC_NOTE(- skipping check because we are cross compiling; assuming sockets are usable) sock=1)
+ rm -f /tmp/conftest*
+ 
+ if test -n "$sock"; then
+@@ -497,7 +500,8 @@ main()
+ }
+ ],AC_NOTE(- you are normal),
+ AC_NOTE(- unix domain sockets are not kept in the filesystem)
+-AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1)
++AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1,
++AC_NOTE(- skipping check because we are cross compiling; assuming sockets are normal))
+ rm -f /tmp/conftest*
+ fi
+ 
+@@ -624,7 +628,8 @@ main()
+   exit(0);
+ }
+ ],AC_NOTE(- select is ok),
+-AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN))
++AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN),
++AC_NOTE(- skipping check because we are cross compiling; assuming select is ok))
+ 
+ dnl
+ dnl    ****  termcap or terminfo  ****
+@@ -666,7 +671,8 @@ main()
+ {
+  exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
+ }], AC_NOTE(- you use the termcap database),
+-AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO))
++AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO),
++AC_NOTE(- skipping check because we are cross compiling; assuming terminfo database is used) AC_DEFINE(TERMINFO))
+ AC_CHECKING(ospeed)
+ AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED))
+ 
+@@ -801,7 +807,8 @@ main()
+     else
+       AC_NOTE(- can't determine - assume ptys are world accessable)
+     fi
+-  ]
++  ],
++  AC_NOTE(- skipping check because we are cross compiling; assuming ptys are world accessable)
+ )
+ rm -f conftest_grp
+ fi
+@@ -885,7 +892,7 @@ AC_EGREP_CPP(yes,
+ #endif
+ ], load=1)
+ fi
+-if test -z "$load" ; then
++if test -z "$load" && test "$cross_compiling" = no ; then
+ AC_CHECKING(for kernelfile)
+ for core in /unix /vmunix /dynix /hp-ux /xelos /dev/ksyms /kernel/unix /kernel/genunix /unicos /mach /netbsd /386bsd /dgux /bsd /stand/vmunix; do
+   if test -f $core || test -c $core; then
+@@ -1078,7 +1085,7 @@ main()
+ #endif
+   exit(0);
+ }
+-],,AC_DEFINE(SYSVSIGS))
++],,AC_DEFINE(SYSVSIGS),:)
+ 
+ fi
+ 
+@@ -1158,7 +1165,7 @@ main() {
+   if (strncmp(buf, "cdedef", 6))
+     exit(1);
+   exit(0); /* libc version works properly.  */
+-}], AC_DEFINE(USEBCOPY))
++}], AC_DEFINE(USEBCOPY),,:)
+ 
+ AC_TRY_RUN([
+ #define bcopy(s,d,l) memmove(d,s,l)
+@@ -1173,7 +1180,8 @@ main() {
+   if (strncmp(buf, "cdedef", 6))
+     exit(1);
+   exit(0); /* libc version works properly.  */
+-}], AC_DEFINE(USEMEMMOVE))
++}], AC_DEFINE(USEMEMMOVE),,
++  AC_NOTE(- skipping check because we are cross compiling; use memmove) AC_DEFINE(USEMEMMOVE))
+ 
+ AC_SYS_LONG_FILE_NAMES
+ 
+-- 
+1.8.4.5
+

rules/screen/patches/0004-cross-compilation-ignore-host-fs.patch

@@ -0,0 +1,132 @@
+From: Maarten ter Huurne <maarten@treewalker.org>
+Date: Sun, 14 Sep 2014 07:10:59 +0200
+Subject: When cross-compiling, skip checks that look in the host file system
+
+Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
+[Ricardo: rebase on top of 4.3.1]
+Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
+---
+ configure.ac | 23 +++++++++++++++++++----
+ 1 file changed, 19 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c4b7cd4..9cf7cee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -85,7 +85,7 @@ AC_ARG_ENABLE(socket-dir,
+ dnl
+ dnl    ****  special unix variants  ****
+ dnl
+-if test -n "$ISC"; then
++if test "$cross_compiling" = no && test -n "$ISC" ; then
+   AC_DEFINE(ISC) LIBS="$LIBS -linet"
+ fi
+ 
+@@ -96,10 +96,11 @@ dnl AC_DEFINE(OSF1)	# this disables MIPS again....
+ dnl fi
+ dnl fi
+ 
+-if test -f /sysV68 ; then
++if test "$cross_compiling" = no && test -f /sysV68 ; then
+ AC_DEFINE(sysV68)
+ fi
+ 
++if test "$cross_compiling" = no ; then
+ AC_CHECKING(for MIPS)
+ if test -f /lib/libmld.a || test -f /usr/lib/libmld.a || test -f /usr/lib/cmplrs/cc/libmld.a; then
+ oldlibs="$LIBS"
+@@ -123,6 +124,7 @@ AC_DEFINE(USE_WAIT2) LIBS="$LIBS -lbsd" ; CC="$CC -I/usr/include/bsd"
+ ))
+ fi
+ fi
++fi
+ 
+ 
+ AC_CHECKING(for Ultrix)
+@@ -132,7 +134,7 @@ AC_EGREP_CPP(yes,
+ #endif
+ ], ULTRIX=1)
+ 
+-if test -f /usr/lib/libpyr.a ; then
++if test "$cross_compiling" = no && test -f /usr/lib/libpyr.a ; then
+ oldlibs="$LIBS"
+ LIBS="$LIBS -lpyr"
+ AC_CHECKING(Pyramid OSX)
+@@ -679,17 +681,21 @@ AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED))
+ dnl
+ dnl    ****  PTY specific things  ****
+ dnl
++if test "$cross_compiling" = no ; then
+ AC_CHECKING(for /dev/ptc)
+ if test -r /dev/ptc; then
+ AC_DEFINE(HAVE_DEV_PTC)
+ fi
++fi
+ 
++if test "$cross_compiling" = no ; then
+ AC_CHECKING(for SVR4 ptys)
+ sysvr4ptys=
+ if test -c /dev/ptmx ; then
+ AC_TRY_LINK([],[ptsname(0);grantpt(0);unlockpt(0);],[AC_DEFINE(HAVE_SVR4_PTYS)
+ sysvr4ptys=1])
+ fi
++fi
+ 
+ AC_CHECK_FUNCS(getpt)
+ 
+@@ -699,6 +705,7 @@ AC_CHECK_FUNCS(openpty,,
+ [AC_CHECK_LIB(util,openpty, [AC_DEFINE(HAVE_OPENPTY)] [LIBS="$LIBS -lutil"])])
+ fi
+ 
++if test "$cross_compiling" = no ; then
+ AC_CHECKING(for ptyranges)
+ if test -d /dev/ptym ; then
+ pdir='/dev/ptym'
+@@ -722,6 +729,7 @@ p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g'  | sort -u | tr -d '\
+ AC_DEFINE_UNQUOTED(PTYRANGE0,"$p0")
+ AC_DEFINE_UNQUOTED(PTYRANGE1,"$p1")
+ fi
++fi
+ 
+ dnl    ****  pty mode/group handling ****
+ dnl
+@@ -869,14 +877,16 @@ fi
+ dnl
+ dnl    ****  loadav  ****
+ dnl
++if test "$cross_compiling" = no ; then
+ AC_CHECKING(for libutil(s))
+ test -f /usr/lib/libutils.a && LIBS="$LIBS -lutils"
+ test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil"
++fi
+ 
+ AC_CHECKING(getloadavg)
+ AC_TRY_LINK(,[getloadavg((double *)0, 0);],
+ AC_DEFINE(LOADAV_GETLOADAVG) load=1,
+-if test -f /usr/lib/libkvm.a ; then
++if test "$cross_compiling" = no && test -f /usr/lib/libkvm.a ; then
+ olibs="$LIBS"
+ LIBS="$LIBS -lkvm"
+ AC_CHECKING(getloadavg with -lkvm)
+@@ -1094,13 +1104,18 @@ dnl    ****  libraries  ****
+ dnl
+ 
+ AC_CHECKING(for crypt and sec libraries)
++if test "$cross_compiling" = no ; then
+ test -f /lib/libcrypt_d.a || test -f /usr/lib/libcrypt_d.a && LIBS="$LIBS -lcrypt_d"
++fi
+ oldlibs="$LIBS"
+ LIBS="$LIBS -lcrypt"
+ AC_CHECKING(crypt)
+ AC_TRY_LINK(,,,LIBS="$oldlibs")
++if test "$cross_compiling" = no ; then
+ test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec"
+ test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow"
++fi
++
+ oldlibs="$LIBS"
+ LIBS="$LIBS -lsun"
+ AC_CHECKING(IRIX sun library)
+-- 
+1.8.4.5
+

rules/screen/patches/0005-avoid-identifying-as-SVR4.patch

@@ -0,0 +1,54 @@
+From: Maarten ter Huurne <maarten@treewalker.org>
+Date: Sun, 14 Sep 2014 11:16:58 +0200
+Subject: Avoid mis-identifying systems as SVR4
+
+My openSUSE 13.1 Linux system was detected as SVR4 because it had
+libelf installed. This leads to linking with libelf, even though no
+symbols from that library were actually used, and to a workaround for
+a buggy getlogin() being enabled.
+
+It is not documented which exact SVR4 system had the bug that the
+workaround was added for, so all I could do is make an educated guess
+at the #defines its compiler would be likely to set.
+
+Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
+[Ricardo: rebase on top of 4.3.1]
+Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
+---
+ configure.ac | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9cf7cee..e09e4cf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -179,14 +179,24 @@ AC_EGREP_CPP(yes,
+ #endif
+ ], LIBS="$LIBS -lsocket -linet";seqptx=1)
+ 
++AC_CHECKING(SVR4)
++AC_EGREP_CPP(yes,
++[main () {
++#if defined(SVR4) || defined(__SVR4)
++  yes;
++#endif
++], AC_NOTE(- you have a SVR4 system) AC_DEFINE(SVR4) svr4=1)
++if test -n "$svr4" ; then
+ oldlibs="$LIBS"
+ LIBS="$LIBS -lelf"
+ AC_CHECKING(SVR4)
+ AC_TRY_LINK([#include <utmpx.h>
+ ],,
+-[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN),
+-[AC_CHECK_HEADER(elf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN))])]
++[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(BUGGYGETLOGIN),
++[AC_CHECK_HEADER(elf.h, AC_DEFINE(BUGGYGETLOGIN))])]
+ ,LIBS="$oldlibs")
++fi
++
+ AC_CHECK_HEADERS([stropts.h string.h strings.h])
+ 
+ AC_CHECKING(for Solaris 2.x)
+-- 
+1.8.4.5
+

rules/screen/patches/0006-install-no-backup-binary.patch

@@ -0,0 +1,39 @@
+From: Maarten ter Huurne <maarten@treewalker.org>
+Date: Sun, 14 Sep 2014 23:58:34 +0200
+Subject: Do not create backup of old installed binary
+
+This is a rather unusual feature that packagers will not expect.
+
+Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
+---
+ Makefile.in | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 187a69b..65549e9 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -83,12 +83,9 @@ screen: $(OFILES)
+ 	    $(OPTIONS) $(CFLAGS) $<
+ 
+ install_bin: .version screen
+-	-if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
+-		then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
+ 	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
+ 	-chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
+ # This doesn't work if $(bindir)/screen is a symlink
+-	-if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
+ 	rm -f $(DESTDIR)$(bindir)/screen
+ 	(cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen)
+ 	cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
+@@ -113,7 +110,6 @@ installdirs:
+ uninstall: .version
+ 	rm -f $(DESTDIR)$(bindir)/$(SCREEN)
+ 	rm -f $(DESTDIR)$(bindir)/screen
+-	-mv $(DESTDIR)$(bindir)/screen.old $(DESTDIR)$(bindir)/screen
+ 	rm -f $(DESTDIR)$(ETCSCREENRC)
+ 	cd doc; $(MAKE) uninstall
+ 
+-- 
+1.8.4.5
+

rules/screen/patches/0007-install-always-chmod.patch

@@ -0,0 +1,29 @@
+From: Maarten ter Huurne <maarten@treewalker.org>
+Date: Mon, 15 Sep 2014 00:03:05 +0200
+Subject: Change binary permission flags even if chown fails
+
+Typically when creating a package, the build is not run as root, so
+the chown will fail. But the chmod can still be done.
+
+Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
+---
+ Makefile.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 65549e9..3c12fdb 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -84,7 +84,8 @@ screen: $(OFILES)
+ 
+ install_bin: .version screen
+ 	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
+-	-chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
++	-chown root $(DESTDIR)$(bindir)/$(SCREEN)
++	-chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
+ # This doesn't work if $(bindir)/screen is a symlink
+ 	rm -f $(DESTDIR)$(bindir)/screen
+ 	(cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen)
+-- 
+1.8.4.5
+

rules/screen/patches/0008-install-nonversioned-binary.patch

@@ -0,0 +1,31 @@
+From: Maarten ter Huurne <maarten@treewalker.org>
+Date: Mon, 15 Sep 2014 00:06:20 +0200
+Subject: Support overriding SCREEN to get a non-versioned binary
+
+If a packager runs "make install SCREEN=screen", do not create
+"screen" as a symlink to itself.
+
+Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
+---
+ Makefile.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile.in b/Makefile.in
+index 3c12fdb..860f351 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -86,9 +86,11 @@ install_bin: .version screen
+ 	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
+ 	-chown root $(DESTDIR)$(bindir)/$(SCREEN)
+ 	-chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
++ifneq (${SCREEN},screen)
+ # This doesn't work if $(bindir)/screen is a symlink
+ 	rm -f $(DESTDIR)$(bindir)/screen
+ 	(cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen)
++endif
+ 	cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
+ 
+ ###############################################################################
+-- 
+1.8.4.5
+

rules/screen/patches/0009-install-dir-dependency.patch

@@ -0,0 +1,43 @@
+From: Maarten ter Huurne <maarten@treewalker.org>
+Date: Mon, 15 Sep 2014 02:27:09 +0200
+Subject: Ensure that installation dirs exist before copying files into them
+
+Since the "install_bin" target requires the installation directories
+to exist, it should depend on the "installdirs" target. The previous
+approach of having "install" depend on "installdirs" is not reliable.
+
+For example, in a parallel build, there was no guarantee that
+"installdirs" would be finished before "install_bin" runs. Also if
+the user requested only "install_bin" to be made, "installdirs" would
+be skipped altogether.
+
+Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 860f351..f0fe08d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -82,7 +82,7 @@ screen: $(OFILES)
+ 	$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(CPPFLAGS) $(DEFS) \
+ 	    $(OPTIONS) $(CFLAGS) $<
+ 
+-install_bin: .version screen
++install_bin: .version screen installdirs
+ 	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
+ 	-chown root $(DESTDIR)$(bindir)/$(SCREEN)
+ 	-chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
+@@ -94,7 +94,7 @@ endif
+ 	cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
+ 
+ ###############################################################################
+-install: installdirs install_bin
++install: install_bin
+ 	cd doc ; $(MAKE) install
+ 	-if [ -d /usr/lib/terminfo ]; then \
+ 		PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
+-- 
+1.8.4.5
+

rules/screen/patches/0010-rename-sched_h.patch

@@ -0,0 +1,142 @@
+From: Maarten ter Huurne <maarten@treewalker.org>
+Date: Mon, 15 Sep 2014 00:24:41 +0200
+Subject: Renamed sched.h to eventqueue.h
+
+There is a <sched.h> system header that got shadowed by "sched.h".
+While Screen itself doesn't include <sched.h>, other system headers
+might include it indirectly. This broke the build when using uClibc
+with pthread support.
+
+Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
+---
+ eventqueue.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ sched.h      | 48 ------------------------------------------------
+ screen.h     |  2 +-
+ 3 files changed, 49 insertions(+), 49 deletions(-)
+ create mode 100644 eventqueue.h
+ delete mode 100644 sched.h
+
+diff --git a/eventqueue.h b/eventqueue.h
+new file mode 100644
+index 0000000..fdc3fc4
+--- /dev/null
++++ b/eventqueue.h
+@@ -0,0 +1,48 @@
++/* Copyright (c) 2008, 2009
++ *      Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de)
++ *      Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de)
++ *      Micah Cowan (micah@cowan.name)
++ *      Sadrul Habib Chowdhury (sadrul@users.sourceforge.net)
++ * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007
++ *      Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de)
++ *      Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de)
++ * Copyright (c) 1987 Oliver Laumann
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 3, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program (see the file COPYING); if not, see
++ * http://www.gnu.org/licenses/, or contact Free Software Foundation, Inc.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
++ *
++ ****************************************************************
++ * $Id$ GNU
++ */
++
++struct event
++{
++  struct event *next;
++  void (*handler) __P((struct event *, char *));
++  char *data;
++  int fd;
++  int type;
++  int pri;
++  struct timeval timeout;
++  int queued;		/* in evs queue */
++  int active;		/* in fdset */
++  int *condpos;		/* only active if condpos - condneg > 0 */
++  int *condneg;
++};
++
++#define EV_TIMEOUT	0
++#define EV_READ		1
++#define EV_WRITE	2
++#define EV_ALWAYS	3
+diff --git a/sched.h b/sched.h
+deleted file mode 100644
+index fdc3fc4..0000000
+--- a/sched.h
++++ /dev/null
+@@ -1,48 +0,0 @@
+-/* Copyright (c) 2008, 2009
+- *      Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de)
+- *      Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de)
+- *      Micah Cowan (micah@cowan.name)
+- *      Sadrul Habib Chowdhury (sadrul@users.sourceforge.net)
+- * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007
+- *      Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de)
+- *      Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de)
+- * Copyright (c) 1987 Oliver Laumann
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 3, or (at your option)
+- * any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program (see the file COPYING); if not, see
+- * http://www.gnu.org/licenses/, or contact Free Software Foundation, Inc.,
+- * 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+- *
+- ****************************************************************
+- * $Id$ GNU
+- */
+-
+-struct event
+-{
+-  struct event *next;
+-  void (*handler) __P((struct event *, char *));
+-  char *data;
+-  int fd;
+-  int type;
+-  int pri;
+-  struct timeval timeout;
+-  int queued;		/* in evs queue */
+-  int active;		/* in fdset */
+-  int *condpos;		/* only active if condpos - condneg > 0 */
+-  int *condneg;
+-};
+-
+-#define EV_TIMEOUT	0
+-#define EV_READ		1
+-#define EV_WRITE	2
+-#define EV_ALWAYS	3
+diff --git a/screen.h b/screen.h
+index 603ca3f..34238c8 100644
+--- a/screen.h
++++ b/screen.h
+@@ -43,7 +43,7 @@
+ #include "osdef.h"
+ 
+ #include "ansi.h"
+-#include "sched.h"
++#include "eventqueue.h"
+ #include "acls.h"
+ #include "comm.h"
+ #include "layer.h"
+-- 
+1.8.4.5
+

rules/syslinux/extlinux.conf

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

rules/u-boot/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '2014.07'
+    '2017.05'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    '36d4bad687edcafa396fee607e505d4e'
+    '1b9ab3707ded74bbde9405987f816969'
 )
 
 post_unpack()

rules/uv4l/default.bash

@@ -22,6 +22,11 @@ post_unpack()
 {
     mv "../etc" "../uv4l-$version/"
     mv "../usr" "../uv4l-$version/"
+    touch startStreamRaspiCam.sh
+    echo "#!/bin/sh" >> startStreamRaspiCam.sh
+    echo "killall uv4l" >> startStreamRaspiCam.sh
+    echo "modprobe cuse" >> startStreamRaspiCam.sh
+    echo "uv4l -nopreview --auto-video_nr --driver raspicam --encoding h264 --width 1080 --height 720 --framerate 12 --quality 8 --server-option '--port=9090' --server-option '--max-queued-connections=30' --server-option '--max-streams=25' --server-option '--max-threads=29'" >> startStreamRaspiCam.sh
 }
 
 host_install()
@@ -34,8 +39,7 @@ target_install()
 {
     $cmd_cp -r "usr/lib/"* "$cfg_dir_rootfs/usr/lib/"
     $cmd_cp -r "usr/bin/"* "$cfg_dir_rootfs/usr/bin/"
-
+    $cmd_cp -r "startStreamRaspiCam.sh" "$cfg_dir_rootfs/usr/bin/"
-    tar -C "$pkg_dir/fs" -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }
 
 

rules/uv4l/fs/etc/rc.d/raspicam

@@ -1,28 +0,0 @@
-start()
-{
-    killall uv4l
-    modprobe cuse &&
-	uv4l \
-	    -nopreview \
-	    --auto-video_nr \
-	    --driver raspicam \
-	    --encoding h264 \
-	    --width 1080 \
-	    --height 720 \
-	    --framerate 20 \
-	    --quality 10 \
-	    --server-option \
-	    --port=9090 \
-	    --server-option \
-	    --max-queued-connections=30 \
-	    --server-option \
-	    --max-streams=25 \
-	    --server-option \
-	    --max-threads=29
-}
-
-stop()
-{
-    killall uv4l
-    rmmod uv4l
-}

rules/zeromq/default.bash

@@ -1,46 +0,0 @@
-version=\
-(
-    "4.1.3"
-)
-
-url=\
-(
-    "http://download.zeromq.org/zeromq-$version.tar.gz"
-)
-
-md5=\
-(
-    "d0824317348cfb44b8692e19cc73dc3a"
-)
-
-configure()
-{
-    ./configure \
-        --prefix="${cfg_dir_toolchain_sysroot}/usr" \
-        --target="$cfg_target_canonical" \
-        --host="$cfg_target_canonical" \
-        --build="$cfg_host_canonical" \
-        --without-libsodium
-}
-
-build()
-{
-    $cmd_make
-}
-
-host_install()
-{
-    $cmd_make install
-}
-
-target_install()
-{
-  # Libs:
-  for f in "$cfg_dir_toolchain_sysroot/usr/lib/"libzmq.*; do
-    if [ -L "$f" ]; then
-      $cmd_cp "$f" "$cfg_dir_rootfs/usr/lib"
-    else
-      $cmd_target_strip -v "$f" -o "$cfg_dir_rootfs/usr/lib/$(basename "$f")"
-    fi
-  done
-}

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

@@ -0,0 +1,7 @@
+cfg_hostname='lauv-aux-rpi-testbed'
+cfg_eth_ext_ip='10.0.200.24'
+cfg_eth_ext_mk='255.255.0.0'
+cfg_eth_ext_gw='10.0.0.1'
+cfg_ptpd_interface='eth0'
+cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind nfs-utils rpi-boot-firmware linux/rpi libconfig log4cpp fftw socat crypto++ netcat screen rlwrap'
+

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-xtreme-2-aux.cfg

@@ -3,3 +3,4 @@ cfg_eth_ext_ip='10.0.10.53'
 cfg_eth_ext_mk='255.255.0.0'
 cfg_eth_ext_gw='10.0.0.1'
 cfg_ptpd_interface='eth0'
+cfg_lauv_storage='internal'

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/caravela.cfg

@@ -1,4 +1,4 @@
 cfg_hostname='caravela'
 cfg_eth_ext_ip='10.0.10.40'
-cfg_packages="$cfg_packages ppp iptables libqmi"
+cfg_packages="$cfg_packages ppp iptables"
-cfg_modules="$cfg_modules ftdi_sio qmi_wwan iptables"
+cfg_modules="$cfg_modules ftdi_sio"

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

@@ -501,7 +501,6 @@ CONFIG_COREDUMP=y
 CONFIG_HAVE_ATOMIC_IOMAP=y
 CONFIG_PMC_ATOM=y
 CONFIG_NET=y
-CONFIG_NET_INGRESS=y
 
 #
 # Networking options
@@ -515,7 +514,6 @@ CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_ROUTE_CLASSID=y
 # CONFIG_IP_PNP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE_DEMUX is not set
@@ -523,7 +521,7 @@ CONFIG_IP_ROUTE_CLASSID=y
 CONFIG_IP_MROUTE=y
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
+# CONFIG_SYN_COOKIES is not set
 # CONFIG_NET_UDP_TUNNEL is not set
 # CONFIG_NET_FOU is not set
 # CONFIG_INET_AH is not set
@@ -544,177 +542,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NET_PTP_CLASSIFY is not set
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
-CONFIG_NETFILTER=y
+# CONFIG_NETFILTER is not set
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_INGRESS=y
-CONFIG_NETFILTER_NETLINK=y
-CONFIG_NETFILTER_NETLINK_ACCT=y
-CONFIG_NETFILTER_NETLINK_QUEUE=y
-CONFIG_NETFILTER_NETLINK_LOG=y
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_LOG_COMMON=y
-CONFIG_NF_CONNTRACK_MARK=y
-# CONFIG_NF_CONNTRACK_ZONES is not set
-CONFIG_NF_CONNTRACK_PROCFS=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_TIMEOUT=y
-CONFIG_NF_CONNTRACK_TIMESTAMP=y
-CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_CONNTRACK_AMANDA=y
-CONFIG_NF_CONNTRACK_FTP=y
-CONFIG_NF_CONNTRACK_H323=y
-CONFIG_NF_CONNTRACK_IRC=y
-CONFIG_NF_CONNTRACK_BROADCAST=y
-CONFIG_NF_CONNTRACK_NETBIOS_NS=y
-CONFIG_NF_CONNTRACK_SNMP=y
-CONFIG_NF_CONNTRACK_PPTP=y
-CONFIG_NF_CONNTRACK_SANE=y
-CONFIG_NF_CONNTRACK_SIP=y
-CONFIG_NF_CONNTRACK_TFTP=y
-CONFIG_NF_CT_NETLINK=y
-CONFIG_NF_CT_NETLINK_TIMEOUT=y
-CONFIG_NF_CT_NETLINK_HELPER=y
-CONFIG_NETFILTER_NETLINK_GLUE_CT=y
-CONFIG_NF_NAT=y
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=y
-CONFIG_NF_NAT_PROTO_UDPLITE=y
-CONFIG_NF_NAT_PROTO_SCTP=y
-CONFIG_NF_NAT_AMANDA=y
-CONFIG_NF_NAT_FTP=y
-CONFIG_NF_NAT_IRC=y
-CONFIG_NF_NAT_SIP=y
-CONFIG_NF_NAT_TFTP=y
-CONFIG_NF_NAT_REDIRECT=y
-CONFIG_NETFILTER_SYNPROXY=y
-# CONFIG_NF_TABLES is not set
-CONFIG_NETFILTER_XTABLES=y
-
-#
-# Xtables combined modules
-#
-CONFIG_NETFILTER_XT_MARK=y
-CONFIG_NETFILTER_XT_CONNMARK=y
-
-#
-# Xtables targets
-#
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
-CONFIG_NETFILTER_XT_TARGET_CT=y
-CONFIG_NETFILTER_XT_TARGET_DSCP=y
-CONFIG_NETFILTER_XT_TARGET_HL=y
-CONFIG_NETFILTER_XT_TARGET_HMARK=y
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
-CONFIG_NETFILTER_XT_TARGET_LOG=y
-CONFIG_NETFILTER_XT_TARGET_MARK=y
-CONFIG_NETFILTER_XT_NAT=y
-CONFIG_NETFILTER_XT_TARGET_NETMAP=y
-CONFIG_NETFILTER_XT_TARGET_NFLOG=y
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=y
-CONFIG_NETFILTER_XT_TARGET_RATEEST=y
-CONFIG_NETFILTER_XT_TARGET_REDIRECT=y
-CONFIG_NETFILTER_XT_TARGET_TEE=y
-CONFIG_NETFILTER_XT_TARGET_TPROXY=y
-CONFIG_NETFILTER_XT_TARGET_TRACE=y
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=y
-
-#
-# Xtables matches
-#
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
-CONFIG_NETFILTER_XT_MATCH_BPF=y
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=y
-CONFIG_NETFILTER_XT_MATCH_COMMENT=y
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
-CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-CONFIG_NETFILTER_XT_MATCH_CPU=y
-CONFIG_NETFILTER_XT_MATCH_DCCP=y
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=y
-CONFIG_NETFILTER_XT_MATCH_DSCP=y
-CONFIG_NETFILTER_XT_MATCH_ECN=y
-CONFIG_NETFILTER_XT_MATCH_ESP=y
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_HELPER=y
-CONFIG_NETFILTER_XT_MATCH_HL=y
-CONFIG_NETFILTER_XT_MATCH_IPCOMP=y
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
-CONFIG_NETFILTER_XT_MATCH_L2TP=y
-CONFIG_NETFILTER_XT_MATCH_LENGTH=y
-CONFIG_NETFILTER_XT_MATCH_LIMIT=y
-CONFIG_NETFILTER_XT_MATCH_MAC=y
-CONFIG_NETFILTER_XT_MATCH_MARK=y
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
-CONFIG_NETFILTER_XT_MATCH_NFACCT=y
-CONFIG_NETFILTER_XT_MATCH_OSF=y
-CONFIG_NETFILTER_XT_MATCH_OWNER=y
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA=y
-CONFIG_NETFILTER_XT_MATCH_RATEEST=y
-CONFIG_NETFILTER_XT_MATCH_REALM=y
-CONFIG_NETFILTER_XT_MATCH_RECENT=y
-CONFIG_NETFILTER_XT_MATCH_SCTP=y
-CONFIG_NETFILTER_XT_MATCH_SOCKET=y
-CONFIG_NETFILTER_XT_MATCH_STATE=y
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
-CONFIG_NETFILTER_XT_MATCH_STRING=y
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
-CONFIG_NETFILTER_XT_MATCH_TIME=y
-CONFIG_NETFILTER_XT_MATCH_U32=y
-# CONFIG_IP_SET is not set
-# CONFIG_IP_VS is not set
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=y
-CONFIG_NF_CONNTRACK_IPV4=y
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_NF_DUP_IPV4=y
-# CONFIG_NF_LOG_ARP is not set
-CONFIG_NF_LOG_IPV4=y
-CONFIG_NF_REJECT_IPV4=y
-CONFIG_NF_NAT_IPV4=y
-CONFIG_NF_NAT_MASQUERADE_IPV4=y
-CONFIG_NF_NAT_SNMP_BASIC=y
-CONFIG_NF_NAT_PROTO_GRE=y
-CONFIG_NF_NAT_PPTP=y
-CONFIG_NF_NAT_H323=y
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_MATCH_AH=y
-CONFIG_IP_NF_MATCH_ECN=y
-CONFIG_IP_NF_MATCH_RPFILTER=y
-CONFIG_IP_NF_MATCH_TTL=y
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_IP_NF_TARGET_SYNPROXY=y
-CONFIG_IP_NF_NAT=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
-CONFIG_IP_NF_TARGET_NETMAP=y
-CONFIG_IP_NF_TARGET_REDIRECT=y
-CONFIG_IP_NF_MANGLE=y
-CONFIG_IP_NF_TARGET_CLUSTERIP=y
-CONFIG_IP_NF_TARGET_ECN=y
-CONFIG_IP_NF_TARGET_TTL=y
-CONFIG_IP_NF_RAW=y
-CONFIG_IP_NF_ARPTABLES=y
-CONFIG_IP_NF_ARPFILTER=y
-CONFIG_IP_NF_ARP_MANGLE=y
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
@@ -1134,37 +962,7 @@ CONFIG_NET_VENDOR_SYNOPSYS=y
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
-CONFIG_PHYLIB=m
+# CONFIG_PHYLIB is not set
-
-#
-# MII PHY device drivers
-#
-# CONFIG_AQUANTIA_PHY is not set
-# CONFIG_AT803X_PHY is not set
-# CONFIG_AMD_PHY is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_TERANETICS_PHY is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_BCM7XXX_PHY is not set
-# CONFIG_BCM87XX_PHY is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_STE10XP is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_MICREL_PHY is not set
-# CONFIG_DP83848_PHY is not set
-# CONFIG_DP83867_PHY is not set
-# CONFIG_MICROCHIP_PHY is not set
-# CONFIG_FIXED_PHY is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MDIO_BCM_UNIMAC is not set
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
 CONFIG_PPP_DEFLATE=m
@@ -1183,40 +981,8 @@ CONFIG_USB_NET_DRIVERS=y
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_RTL8152 is not set
 # CONFIG_USB_LAN78XX is not set
-CONFIG_USB_USBNET=m
+# CONFIG_USB_USBNET is not set
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_AX88179_178A=m
-CONFIG_USB_NET_CDCETHER=m
-# CONFIG_USB_NET_CDC_EEM is not set
-CONFIG_USB_NET_CDC_NCM=m
-# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set
-# CONFIG_USB_NET_CDC_MBIM is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_SR9700 is not set
-# CONFIG_USB_NET_SR9800 is not set
-# CONFIG_USB_NET_SMSC75XX is not set
-# CONFIG_USB_NET_SMSC95XX is not set
-# CONFIG_USB_NET_GL620A is not set
-CONFIG_USB_NET_NET1080=m
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-CONFIG_USB_NET_CDC_SUBSET=m
-# CONFIG_USB_ALI_M5632 is not set
-# CONFIG_USB_AN2720 is not set
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_EPSON2888 is not set
-# CONFIG_USB_KC2190 is not set
-CONFIG_USB_NET_ZAURUS=m
-# CONFIG_USB_NET_CX82310_ETH is not set
-# CONFIG_USB_NET_KALMIA is not set
-CONFIG_USB_NET_QMI_WWAN=m
-# CONFIG_USB_NET_INT51X1 is not set
 # CONFIG_USB_IPHETH is not set
-# CONFIG_USB_SIERRA_NET is not set
-# CONFIG_USB_VL600 is not set
-# CONFIG_USB_NET_CH9200 is not set
 # CONFIG_WLAN is not set
 
 #
@@ -1416,7 +1182,7 @@ CONFIG_SCx200_ACB=y
 # PPS support
 #
 CONFIG_PPS=y
-# CONFIG_PPS_DEBUG is not set
+CONFIG_PPS_DEBUG=y
 CONFIG_NTP_PPS=y
 
 #
@@ -1812,7 +1578,7 @@ CONFIG_USB_OHCI_HCD_PCI=y
 #
 CONFIG_USB_ACM=y
 # CONFIG_USB_PRINTER is not set
-CONFIG_USB_WDM=m
+# CONFIG_USB_WDM is not set
 # CONFIG_USB_TMC is not set
 
 #
@@ -2264,6 +2030,8 @@ CONFIG_NLS_UTF8=y
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_VFIO_VIRQFD=y
 
 #
 # printk and dmesg options
@@ -2614,7 +2382,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
-CONFIG_LIBCRC32C=y
+CONFIG_LIBCRC32C=m
 # CONFIG_CRC8 is not set
 # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
 # CONFIG_RANDOM32_SELFTEST is not set
@@ -2625,10 +2393,6 @@ CONFIG_LZO_DECOMPRESS=m
 # CONFIG_XZ_DEC is not set
 # CONFIG_XZ_DEC_BCJ is not set
 CONFIG_GENERIC_ALLOCATOR=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=y
-CONFIG_TEXTSEARCH_BM=y
-CONFIG_TEXTSEARCH_FSM=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y

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 memtest86+'
+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_terminal='ttyS0'
 cfg_target_linux_kernel='arch/x86/boot/bzImage'
 cfg_ptpd_master='true'
@@ -12,5 +12,5 @@ cfg_ptpd_interface='eth0'
 cfg_eth_ext_mk='255.255.0.0'
 cfg_eth_ext_gw='10.0.0.1'
 cfg_eth_prv_ip='192.168.0.1'
-cfg_escc_script=''
+cfg_escc_script='/etc/escc/hg1700.sh'
 cfg_kernel_extra_args='panic=5 quiet'

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

@@ -1,4 +1,3 @@
 cfg_hostname='lauv-xplore-1'
 cfg_eth_ext_ip='10.0.10.120'
-cfg_packages="$cfg_packages  ppp iptables"
 cfg_modules="$cfg_modules ftdi_sio"

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

@@ -1,4 +1,2 @@
 cfg_hostname='lauv-xplore-2'
 cfg_eth_ext_ip='10.0.10.130'
-cfg_packages="$cfg_packages  ppp iptables"
-cfg_modules="$cfg_modules ftdi_sio"

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-a9xx/patches/u-boot/2017.05/00-igep0020-lsts.patch

@@ -33,9 +33,9 @@ index 79daabd..f1b5bb1 100644
 
 +#undef CONFIG_BOOT_ONENAND
 +
- #ifdef CONFIG_BOOT_NAND
+ #define CONFIG_NR_DRAM_BANKS            2
  #define CONFIG_NAND
- #endif
+
 @@ -201,4 +203,42 @@
  #define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_HAM1_CODE_HW
  #endif
@@ -58,15 +58,15 @@ index 79daabd..f1b5bb1 100644
 +  "icache on;"                                                          \
 +  "setenv bootargs \"console=${console} root=${mmcroot} rootfstype=${mmcrootfstype} rootwait ro quiet\"; " \
 +  "mmc dev 0; "                                                         \
-+  "ext4load mmc0 0:2 ${loadaddr} /boot/kernel; "                        \
++  "ext4load mmc 0:2 ${loadaddr} /boot/kernel; "                        \
-+  "ext4load mmc0 0:2 ${dtbaddr} /boot/board.dtb; "                      \
++  "ext4load mmc 0:2 ${dtbaddr} /boot/board.dtb; "                      \
 +  "bootz ${loadaddr} - ${dtbaddr}; " \
 +
 +#undef CONFIG_ENV_SIZE
 +#define CONFIG_ENV_SIZE			(128 << 10)
 +
-+#define CONFIG_ENV_IS_NOWHERE
++/*#define CONFIG_ENV_IS_NOWHERE*/
-+#define CONFIG_ZERO_BOOTDELAY_CHECK
++/*#define CONFIG_ZERO_BOOTDELAY_CHECK*/
 +
 +/* USB */
 +#undef CONFIG_MUSB_UDC

systems/lctr-b2xx/CMRE-bbb.cfg

@@ -0,0 +1,7 @@
+cfg_hostname='lauv-aux-bbb-testbed'
+cfg_eth_ext_ip='10.0.200.24'
+cfg_eth_ext_mk='255.255.0.0'
+cfg_eth_ext_gw='10.0.0.1'
+cfg_ptpd_interface='eth0'
+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'
+

systems/lctr-b2xx/config

@@ -6,7 +6,7 @@ cfg_services2='dune'
 cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux'
 cfg_target_linux_kernel='arch/arm/boot/zImage'
 cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lctr-b2xx.dtb'
-cfg_target_uboot_config='am335x_bbb'
+cfg_target_uboot_config='am335x_boneblack'
 cfg_ptpd_interface='eth0'
 cfg_terminal='ttyO0'
 cfg_partitions=\

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

@@ -1,7 +0,0 @@
-cfg_hostname='lauv-noptilus-1-aux'
-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 boost jansson czmq zeromq"

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

@@ -1,7 +0,0 @@
-cfg_hostname='lauv-noptilus-2-aux'
-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 boost jansson czmq zeromq"

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 boost jansson czmq zeromq"

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

@@ -1,13 +1,14 @@
---- linux-4.4.66/arch/arm/boot/dts/Makefile	2017-09-25 13:07:10.353013618 +0100
+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.tsm/arch/arm/boot/dts/Makefile	2017-09-25 13:11:13.523693878 +0100
+--- linux-3.13.1/arch/arm/boot/dts/Makefile	2014-01-29 13:06:37.000000000 +0000
-@@ -463,6 +463,7 @@
++++ linux-3.13.1.rasm/arch/arm/boot/dts/Makefile	2014-02-01 06:53:43.968486026 +0000
- 	am335x-evm.dtb \
+@@ -198,6 +198,7 @@
  	am335x-evmsk.dtb \
- 	am335x-nano.dtb \
+ 	am335x-bone.dtb \
+ 	am335x-boneblack.dtb \
 +	am335x-lctr-b2xx.dtb \
- 	am335x-pepper.dtb \
+ 	am335x-nano.dtb \
- 	am335x-lxm.dtb \
+ 	am335x-base0033.dtb \
- 	am335x-chiliboard.dtb \
+ 	am3517-evm.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-b2xx/patches/u-boot/2014.07/01-am335x-bbb.patch

@@ -1,153 +0,0 @@
-diff --git a/boards.cfg b/boards.cfg
-index 1ba2081..08dc221 100644
---- a/boards.cfg
-+++ b/boards.cfg
-@@ -1218,3 +1218,4 @@ Orphan  powerpc     ppc4xx         -           sandburst       metrobox
- # The following were move to "Orphan" in September, 2013
- Orphan  arm         arm1136        mx31        -               imx31_phycore       imx31_phycore_eet                     imx31_phycore:IMX31_PHYCORE_EET                                                                                                   (resigned) Guennadi Liakhovetski <g.liakhovetski@gmx.de>
- Orphan  arm         arm1136        mx31        freescale       mx31ads             mx31ads                               -                                                                                                                                 (resigned) Guennadi Liakhovetski <g.liakhovetski@gmx.de>
-+Active  arm         armv7          am33xx      ti              am335x              am335x_bbb                           am335x_bbb:SERIAL1,CONS_INDEX=1                                                                                                    Ricardo Martins <rasm@fe.up.pt>
-diff --git a/include/configs/am335x_bbb.h b/include/configs/am335x_bbb.h
-new file mode 100644
-index 0000000..9e00817
---- /dev/null
-+++ b/include/configs/am335x_bbb.h
-@@ -0,0 +1,138 @@
-+/*
-+ * am335x_evm.h
-+ *
-+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation version 2.
-+ *
-+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
-+ * kind, whether express or implied; without even the implied warranty
-+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ */
-+
-+#ifndef __CONFIG_AM335X_EVM_H
-+#define __CONFIG_AM335X_EVM_H
-+
-+#include <configs/ti_am335x_common.h>
-+
-+#ifdef CONFIG_BOOTDELAY
-+#  undef CONFIG_BOOTLDELAY
-+#endif
-+#define CONFIG_BOOTDELAY 2
-+#define CONFIG_AUTOBOOT_KEYED 1
-+#define CONFIG_AUTOBOOT_DELAY_STR "uboot"
-+#define CONFIG_AUTOBOOT_PROMPT \
-+			"autoboot in %d seconds\n",bootdelay
-+
-+#undef CONFIG_BOOTM_NETBSD
-+#undef CONFIG_BOOTM_PLAN9
-+#undef CONFIG_BOOTM_RTEMS
-+#undef CONFIG_BOOTM_VXWORKS
-+#undef CONFIG_BOOTP_DNS
-+#undef CONFIG_BOOTP_DNS2
-+#undef CONFIG_BOOTP_SEND_HOSTNAME
-+#undef CONFIG_CMD_ASKENV
-+#undef CONFIG_CMD_BDI
-+#undef CONFIG_CMD_BOOTD
-+#undef CONFIG_CMD_CRC32
-+#undef CONFIG_CMD_DFU
-+#undef CONFIG_CMD_DHCP
-+#undef CONFIG_CMD_EDITENV
-+#undef CONFIG_CMD_EDITENV
-+#undef CONFIG_CMD_EXPORTENV
-+#undef CONFIG_CMD_FPGA
-+#undef CONFIG_CMD_ITEST
-+#undef CONFIG_CMD_LOADB
-+#undef CONFIG_CMD_LOADS
-+#undef CONFIG_CMD_MEMORY
-+#undef CONFIG_CMD_MISC
-+#undef CONFIG_CMD_NET
-+#undef CONFIG_CMD_NFS
-+#undef CONFIG_CMD_PING
-+#undef CONFIG_CMD_SETGETDCR
-+#undef CONFIG_CMD_SPI
-+#undef CONFIG_DRIVER_TI_CPSW
-+#undef CONFIG_MII
-+#undef CONFIG_MUSB_GADGET
-+#undef CONFIG_MUSB_HOST
-+#undef CONFIG_NAND
-+#undef CONFIG_OMAP3_SPI
-+#undef CONFIG_SPI
-+#undef CONFIG_SPI_BOOT
-+#undef CONFIG_SPL_ETH_SUPPORT
-+#undef CONFIG_SPL_NAND_LOAD
-+#undef CONFIG_SPL_NAND_SUPPORT
-+#undef CONFIG_SPL_SPI_FLASH_SUPPORT
-+#undef CONFIG_SPL_SPI_LOAD
-+#undef CONFIG_SPL_SPI_SUPPORT
-+#undef CONFIG_SPL_YMODEM_SUPPORT
-+#undef CONFIG_SYS_LONGHELP
-+
-+#define MACH_TYPE_TIAM335EVM		3589	/* Until the next sync */
-+#define CONFIG_MACH_TYPE		MACH_TYPE_TIAM335EVM
-+
-+/* Clock Defines */
-+#define V_OSCK				24000000  /* Clock output from T2 */
-+#define V_SCLK				(V_OSCK)
-+
-+/* Custom script for NOR */
-+#define CONFIG_SYS_LDSCRIPT		"board/ti/am335x/u-boot.lds"
-+
-+/* Always 128 KiB env size */
-+#define CONFIG_ENV_SIZE			(128 << 10)
-+
-+#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-+
-+#ifndef CONFIG_SPL_BUILD
-+#define CONFIG_EXTRA_ENV_SETTINGS                                       \
-+  "loadaddr=0x80200000\0"                                               \
-+  "fdtaddr=0x80F80000\0"                                                \
-+  "console=ttyO0,115200n8\0"                                            \
-+  "mmcroot=/dev/mmcblk0p2\0"                                            \
-+  "mmcrootfstype=ext4\0"
-+
-+#define CONFIG_BOOTCOMMAND                                              \
-+  "setenv bootargs \"console=${console} root=${mmcroot} rootfstype=${mmcrootfstype} rootwait ro quiet\"; " \
-+  "mmc dev 0; "                                                         \
-+  "ext4load mmc0 0:2 ${loadaddr} /boot/kernel; "                        \
-+  "ext4load mmc0 0:2 ${fdtaddr} /boot/board.dtb; "                      \
-+  "bootz ${loadaddr} - ${fdtaddr}; "
-+
-+#endif
-+
-+/* NS16550 Configuration */
-+#define CONFIG_SYS_NS16550_COM1		0x44e09000	/* Base EVM has UART0 */
-+#define CONFIG_SYS_NS16550_COM2		0x48022000	/* UART1 */
-+#define CONFIG_SYS_NS16550_COM3		0x48024000	/* UART2 */
-+#define CONFIG_SYS_NS16550_COM4		0x481a6000	/* UART3 */
-+#define CONFIG_SYS_NS16550_COM5		0x481a8000	/* UART4 */
-+#define CONFIG_SYS_NS16550_COM6		0x481aa000	/* UART5 */
-+#define CONFIG_BAUDRATE			115200
-+
-+#define CONFIG_CMD_EEPROM
-+#define CONFIG_ENV_EEPROM_IS_ON_I2C
-+#define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* Main EEPROM */
-+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	2
-+#define CONFIG_SYS_I2C_MULTI_EEPROMS
-+
-+/* PMIC support */
-+#define CONFIG_POWER_TPS65217
-+#define CONFIG_POWER_TPS65910
-+
-+/* SPL */
-+#define CONFIG_SPL_POWER_SUPPORT
-+
-+
-+/* Bootcount using the RTC block */
-+#define CONFIG_BOOTCOUNT_LIMIT
-+#define CONFIG_BOOTCOUNT_AM33XX
-+
-+/* SPI flash. */
-+#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
-+
-+#define CONFIG_ENV_IS_NOWHERE
-+
-+#endif	/* ! __CONFIG_AM335X_EVM_H */

systems/lctr-b2xx/patches/u-boot/2017.05/01-am335x-bbb.patch

@@ -0,0 +1,13 @@
+diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
+index fc8a08f..0cfcec2 100644
+--- a/include/configs/am335x_evm.h
++++ b/include/configs/am335x_evm.h
+@@ -104,7 +104,7 @@
+ 	DEFAULT_FIT_TI_ARGS \
+ 	"bootpart=0:2\0" \
+ 	"bootdir=/boot\0" \
+-	"bootfile=zImage\0" \
++	"bootfile=kernel\0" \
+ 	"fdtfile=undefined\0" \
+ 	"console=ttyO0,115200n8\0" \
+ 	"partitions=" \

systems/lctr-b2xx/x8-06.cfg

@@ -3,4 +3,4 @@ cfg_storage='data0:ext4:/opt'
 cfg_eth_ext_ip='10.0.20.105'
 cfg_eth_ext_mk='255.255.0.0'
 cfg_eth_ext_gw='10.0.0.1'
-cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux opencv exiv2 libav'
+cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libav'

systems/lctr-b2xx/x8-07.cfg

@@ -3,5 +3,4 @@ cfg_storage='data0:ext4:/opt'
 cfg_eth_ext_ip='10.0.20.110'
 cfg_eth_ext_mk='255.255.0.0'
 cfg_eth_ext_gw='10.0.0.1'
-cfg_services1='huawei'
+cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux opencv libav'
-cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools uswitch ppp iptables am33xx-cm3/host linux opencv exiv2 libav'

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

@@ -1,5 +1,9 @@
 # Core.
 arm_freq=1000
+sdram_freq=500
+core_freq=500
+over_voltage=2
+temp_limit=80 #Will throttle to default clock speed if hit.
 
 # Disable BT on Rpi3.
 dtoverlay=pi3-disable-bt

systems/lctr-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/lctr-rpi/fs/etc/rc.d/lauv-storage-server

@@ -0,0 +1,125 @@
+mount_storage()
+{
+    echo "* Probing storage..."
+
+    bdev="$1"
+    if ! [ -b "$bdev" ]; then
+        echo "* Device $bdev does not exist."
+        return 1
+    fi
+
+    mount -o rw,relatime "$bdev" "$cfg_lauv_storage_dir" 2> /dev/null
+
+    if [ $? -ne 0 ]; then
+        echo "* Failed to mount $bdev on $cfg_lauv_storage_dir"
+        return 1
+    fi
+
+    echo "* Mounted '$bdev' on '$cfg_lauv_storage_dir'"
+    return 0
+}
+
+try_mount_storage()
+{
+    n=0; while [ $n -lt 30 ]; do
+             mount_storage "$1"
+
+             if [ $? -eq 0 ]; then
+                 return 0
+             fi
+
+             sleep 1
+             let n++
+         done
+
+    return 1
+}
+
+start_nfs_server()
+{
+    echo "* Creating NFS administrative folder..."
+    mkdir -p /var/lib/nfs
+    if ! [ -d /var/lib/nfs ]; then
+        echo "ERROR: failed to create data folder."
+        return 1
+    fi
+
+    echo "* Launching rpcbind..."
+    /usr/bin/rpcbind
+    if [ $? -ne 0 ]; then
+        echo "ERROR: failed to start rpcbind."
+        return 1
+    fi
+
+    echo "* Launching rpc.statd..."
+    /usr/bin/rpc.statd
+    if [ $? -ne 0 ]; then
+        echo "ERROR: failed to start rpc.statd."
+        return 1
+    fi
+
+    echo "* Launching rpc.nfsd..."
+    /usr/bin/rpc.nfsd
+    if [ $? -ne 0 ]; then
+        echo "ERROR: failed to start rpc.nfsd."
+        return 1
+    fi
+
+    echo "* Creating NFS filesystem table..."
+    /usr/bin/exportfs -ra
+    if [ $? -ne 0 ]; then
+        echo "ERROR: failed to create filesystem table."
+        return 1
+    fi
+
+    echo "* Launching rpc.mountd..."
+    /usr/bin/rpc.mountd
+    if [ $? -ne 0 ]; then
+        echo "ERROR: failed to start rpc.mountd."
+        return 1
+    fi
+
+    echo "* Exporting NFS filesystems..."
+    /usr/bin/exportfs \
+        -o rw,async,no_root_squash,no_subtree_check \
+        10.0.0.0/16:"$cfg_lauv_storage_dir"
+    if [ $? -ne 0 ]; then
+        echo "ERROR: failed to export filesystems."
+        return 1
+    fi
+}
+
+stop_nfs_server()
+{
+    echo "* Unexporting NFS filesystems..."
+    exportfs -au 2> /dev/null
+    echo "* Terminating rpc.mountd..."
+    killall rpc.mountd 2> /dev/null
+    echo "* Terminating rpc.statd..."
+    killall rpc.statd 2> /dev/null
+    echo "* Terminating rpc.bind..."
+    killall rpcbind 2> /dev/null
+}
+
+start()
+{
+    mkdir -p "$cfg_lauv_storage_dir"
+
+    # Removable storage.
+    if [ "$cfg_lauv_storage" != "internal" ]; then
+        try_mount_storage /dev/sda1
+    fi
+
+    # FIXME: what to do if the above fails.
+    start_nfs_server
+}
+
+stop()
+{
+    stop_nfs_server
+
+    if [ "$cfg_lauv_storage" != "internal" ]; then
+        echo "* Unmounting storage..."
+        umount "$cfg_lauv_storage_dir"
+    fi
+}

systems/lctr-rpi/mariner-01.cfg

@@ -1,6 +1,4 @@
 cfg_hostname='mariner-01'
 cfg_eth_ext_ip='10.0.20.125'
-cfg_packages="$cfg_packages opencv raspicam exiv2 libav iw"
+cfg_packages="$cfg_packages raspicam libjpeg-turbo v4l-utils uv4l libav"
-cfg_modules="$cfg_modules ftdi_sio rt73usb"
+cfg_modules="$cfg_modules ftdi_sio"
-cfg_services0='network-wlan dropbear storage upgrade syslog ptpd check_wlan'
-cfg_ptpd_interface='wlan0'

systems/lctr-rpi/rpi-camera-aux.cfg

@@ -0,0 +1,9 @@
+cfg_hostname='rpi-camera-aux'
+cfg_eth_ext_ip='10.0.200.52'
+cfg_services1='lauv-storage-server'
+cfg_packages='dropbear rsync busybox e2fsprogs dosfstools rpcbind rpi-boot-firmware linux/rpi exiv2 pointgrey opencv nfs-utils'
+cfg_services0='network dropbear storage upgrade syslog'
+cfg_modules="$cfg_modules ftdi_sio"
+cfg_terminal='ttyAMA0'
+cfg_ptpd_interface='eth0'
+cfg_lauv_storage_dir='/opt/lsts/dune/log'

systems/lctr-rpi/rpi-camera-main.cfg

@@ -0,0 +1,12 @@
+cfg_hostname='rpi-camera-main'
+cfg_eth_ext_ip='10.0.200.53'
+cfg_services1='lauv-storage-client'
+cfg_packages='dropbear rsync busybox e2fsprogs dosfstools rpcbind rpi-boot-firmware linux/rpi exiv2 pointgrey opencv nfs-utils'
+cfg_services0='network dropbear storage upgrade syslog'
+cfg_modules="$cfg_modules ftdi_sio"
+cfg_terminal='ttyAMA0'
+cfg_ptpd_interface='eth0'
+cfg_lauv_storage_host=10.0.200.52
+cfg_lauv_storage_paths=/opt/lsts/dune/log
+cfg_lauv_storage_timeout=20
+

systems/lctr-rpi/test-rpi.cfg

@@ -1,9 +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 raspicam libjpeg-turbo v4l-utils uv4l iw'
+cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind rpi-boot-firmware linux/rpi libconfig log4cpp crypto++'
-cfg_services0='network-wlan dropbear storage upgrade syslog ptpd check_wlan'
+cfg_services0='network dropbear storage upgrade syslog ptpd'
-cfg_modules="$cfg_modules ftdi_sio rt73usb"
+cfg_modules="$cfg_modules ftdi_sio"
-cfg_terminal='tty1'
+cfg_terminal='ttyAMA0'
-cfg_ptpd_interface='wlan0'
+cfg_ptpd_interface='eth0'
 

systems/lctr-rpi/x8-08.cfg

@@ -1,5 +1,4 @@
 cfg_hostname='x8-08'
 cfg_eth_ext_ip='10.0.20.115'
-cfg_services1='huawei'
+cfg_packages="$cfg_packages raspicam opencv uv4l libav"
-cfg_packages="$cfg_packages opencv raspicam exiv2 libav uswitch"
 cfg_modules="$cfg_modules ftdi_sio"

systems/ntnu-b2xx/cfg/linux-3.14.63.cfg

@@ -2622,8 +2622,3 @@ CONFIG_CLZ_TAB=y
 CONFIG_MPILIB=m
 CONFIG_OID_REGISTRY=m
 CONFIG_VIRTUALIZATION=y
-
-CONFIG_RFKILL=y
-CONFIG_CFG80211=y
-CONFIG_NL80211=y
-CONFIG_RT2800USB=y

systems/ntnu-b2xx/fs/etc/rc.d/rtklib_rtkrcv

@@ -1,9 +1,5 @@
 start()
 {
-    if [ ! -d "/opt/lsts/rtklib/" ]; then
-      mkdir /opt/lsts/rtklib
-    fi
-
     localBackupPath="/opt/lsts/rtklib/rtklib_cmdfile.cmd"
     cfgPath="/etc/rtklib/conf/rtkrcv.conf"
     cfgPathUse="/opt/lsts/rtklib/conf_use.conf"

systems/ntnu-b2xx/ntnu-bixler-001.cfg

@@ -1,8 +0,0 @@
-# ntnu-bixler-00x
-cfg_hostname='ntnu-bixler-001'
-cfg_eth_ext_ip='10.0.60.180'
-cfg_eth_ext_mk='255.255.0.0'
-cfg_eth_ext_gw='10.0.60.1'
-cfg_ptpd_interface='eth0'
-cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux rtklib libphidget ethtool socat'
-cfg_services1='vsp_pair rtc-ds3231 rtklib_rtkrcv'

systems/ntnu-b2xx/ntnu-cruisermini-001-pseudo.cfg

@@ -1,7 +0,0 @@
-# ntnu-cruisermini-00x
-cfg_hostname='ntnu-cruisermini-001-pseudo'
-cfg_eth_ext_ip='10.0.60.149'
-cfg_eth_ext_mk='255.255.0.0'
-cfg_eth_ext_gw='10.0.60.1'
-cfg_ptpd_interface='eth0'
-cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux rtklib libphidget ethtool socat openssl openssh sshpass'