systems/lauv-atom/patches/linux: change version for 4.9.

.gitignore

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

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-a72.cfg

@@ -1,6 +0,0 @@
-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=cortex-a72 -mtune=cortex-a72 -mfloat-abi=hard -mfpu=neon-fp-armv8'
-cfg_target_gcc_configure_flags='--with-cpu=cortex-a72 --with-tune=cortex-a72 --with-fpu=neon-fp-armv8 --with-float=hard'
-cfg_target_ar_flags='aarch64-elf'

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_glibc_configure_flags='--with-cpu=i686'
+cfg_target_gcc_configure_flags='--mwith-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

@@ -20,19 +20,31 @@
 # Author: Ricardo Martins                                                 #
 ###########################################################################
 
-FROM debian:8
+FROM debian:9
 
 MAINTAINER Ricardo Martins <rasm@oceanscan-mst.com>
+MAINTAINER Pedro Gonçalves <pedro@lsts.pt>
 
 ENV DEBIAN_FRONTEND noninteractive
 
 # Update distro.
+RUN echo "deb http://ftp.us.debian.org/debian testing non-free contrib" >> /etc/apt/sources.list
+RUN apt-get update
+RUN apt-get install -y gnupg2
+RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 40976EAF437D05B5
+RUN apt-get install -y apt-utils
+RUN apt-get install -y gpgv
 RUN apt-get update -y
+RUN apt-get install -y apt-utils
 RUN apt-get dist-upgrade -y
+RUN apt-get install -y bash-completion
 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

docker/Makefile

@@ -21,7 +21,7 @@
 ###########################################################################
 
 TAG     := glued
-VERSION := 2016.05.0
+VERSION := 2020.07.24
 VOLUME  := $(CURDIR)/..
 DNS     := 8.8.8.8
 
@@ -30,3 +30,15 @@ all:
 
 shell:
 	docker run -w $(VOLUME) --dns=$(DNS) -i -a stdin -a stdout -v $(VOLUME):$(VOLUME) -t $(TAG):$(VERSION)
+
+clean:
+	@echo "* Stopping docker service..."
+	@sudo systemctl stop docker
+	@echo "* Cleaning docker service..."
+	@sudo rm -rf /var/lib/docker
+	@echo "* Starting docker service..."
+	@sudo systemctl start docker
+	@echo "* Done."
+
+delete_img:
+	@sudo docker system prune -a

functions.bash

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

mkconfig.bash

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

mkdisk.bash

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

mkpackage.bash

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

mksystem.bash

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

mkupdate.bash

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

pkrootfs.bash

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

pktoolchain.bash

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

rules/binutils/cross.bash

@@ -1,16 +1,16 @@
 version=\
 (
-    '2.35'
+    '2.25'
 )
 
 url=\
 (
-    "http://mirrors.kernel.org/gnu/binutils/binutils-$version.tar.xz"
+    "http://mirrors.kernel.org/gnu/binutils/binutils-$version.tar.bz2"
 )
 
 md5=\
 (
-    'fc8d55e2f6096de8ff8171173b6f5087'
+    'd9f3303f802a5b6b0bb73a335ab89d66'
 )
 
 maintainer=\

rules/binutils/default.bash

@@ -1,43 +0,0 @@
-version=\
-(
-    '2.35'
-)
-
-url=\
-(
-    "http://mirrors.kernel.org/gnu/binutils/binutils-$version.tar.xz"
-)
-
-md5=\
-(
-    'fc8d55e2f6096de8ff8171173b6f5087'
-)
-
-maintainer=\
-(
-    'Ricardo Martins <rasm@fe.up.pt>'
-)
-
-build_dir=$pkg_var
-
-configure()
-{
-    "../binutils-$version/configure" \
-        --prefix="$cfg_dir_toolchain" \
-        --target="$cfg_target_canonical" \
-        --host="$cfg_host_canonical" \
-        --build="$cfg_host_canonical" \
-        --with-sysroot="$cfg_dir_toolchain_sysroot" \
-        --disable-multilib \
-        --disable-nls
-}
-
-build()
-{
-    $cmd_make
-}
-
-host_install()
-{
-    $cmd_make install-strip
-}

rules/bison/default.bash

@@ -1,37 +0,0 @@
-version=\
-(
-    '2.5.1'
-)
-
-url=\
-(
-    "http://ftp.gnu.org/gnu/bison/bison-$version.tar.gz"
-)
-
-md5=\
-(
-    '8fedf916f1aa2c4a31441d8f8bbc603c'
-)
-
-maintainer=\
-(
-    'Ricardo Martins <rasm@fe.up.pt>'
-)
-
-configure()
-{
-    ./configure \
-        --prefix="$cfg_dir_toolchain" \
-        --disable-shared \
-        --enable-static
-}
-
-build()
-{
-    $cmd_make
-}
-
-host_install()
-{
-    $cmd_make install
-}

rules/boost/default.bash

@@ -37,8 +37,7 @@ configure()
 {
     cd "../boost_$vendor_version" &&
     ./bootstrap.sh \
-        --with-icu="$cfg_dir_toolchain_sysroot/usr" \
-        --with-libraries="regex,filesystem,system,thread"
+        --with-icu="$cfg_dir_toolchain_sysroot/usr"
 
     GXX_VER=$(${cmd_target_cxx} -dumpversion)
     echo "using gcc : ${GXX_VER}  : ${cmd_target_cxx} : <cxxflags>\"-pipe -Os  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ${cfg_target_gcc_flags} \" <linkflags>\"\" ;" > user-config.jam

rules/bzip2/common.bash

@@ -5,7 +5,7 @@ version=\
 
 url=\
 (
-    "http://bzip.org/1.0.6/bzip2-$version.tar.gz"
+    "https://sourceforge.net/projects/bzip2/files/bzip2-$version.tar.gz"
 )
 
 md5=\

rules/curl/default.bash

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

rules/elfutils/default.bash

@@ -0,0 +1,42 @@
+version=\
+(
+    '0.180'
+)
+
+url=\
+(
+    "ftp://sourceware.org/pub/elfutils/$version/elfutils-$version.tar.bz2"
+)
+
+md5=\
+(
+    '23feddb1b3859b03ffdbaf53ba6bd09b'
+)
+
+requires=\
+(
+    'zlib/host'
+    'zlib/default'
+)
+
+configure()
+{
+    MAKEINFO='/bin/true' \
+    "./configure" --disable-debuginfod \
+        --build="$cfg_host_canonical" \
+        --target="$cmd_target_prefix" \
+        --host="$cfg_host_canonical" \
+        --prefix="$cfg_dir_toolchain" \
+        CC="$cmd_target_cc" \
+        CXX="$cmd_target_cxx"
+}
+
+build()
+{
+    $cmd_make
+}
+
+host_install()
+{
+    $cmd_make install
+}

rules/exiftool/default.bash

@@ -1,37 +0,0 @@
-version=\
-(
-  "10.96"
-)
-
-url=\
-(
-  "https://lsts.pt/glued/exiftoolBin-${version}.tar.gz"
-)
-
-md5=\
-(
-  "71d52bf2d75f023b844dd8c9100daaff"
-)
-
-maintainer=\
-(
-  'Pedro Gonçalves <pedro@lsts.pt>'
-)
-
-requires=\
-(
-    'perl/default'
-)
-
-post_unpack()
-{
-    $cmd_cp -r ../exiftoolBin-${version}/* .
-}
-
-target_install()
-{
-   $cmd_cp -rv usr/* $cfg_dir_toolchain_sysroot/usr/
-   $cmd_cp -rv usr/* $cfg_dir_rootfs/usr/
-   $cmd_cp -rv usr/local/bin/* $cfg_dir_rootfs/usr/bin/
-}
-

rules/gcc/common.bash

@@ -1,16 +1,16 @@
 version=\
 (
-    '10.2.0'
+    '9.3.0'
 )
 
 url=\
 (
-    "http://mirrors.kernel.org/gnu/gcc/gcc-$version/gcc-$version.tar.xz"
+    "http://mirrors.kernel.org/gnu/gcc/gcc-$version/gcc-$version.tar.gz"
 )
 
 md5=\
 (
-    'e9fd9b1789155ad09bcf3ae747596b50'
+    '9b7e8f6cfad96114e726c752935af58a'
 )
 
 build_dir=$pkg_var

rules/glibc/common.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '2.22'
+    '2.26'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    'e51e02bf552a0a1fbbdc948fb2f5e83c'
+    '102f637c3812f81111f48f2427611be1'
 )
 
 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/htop/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '2.0.2'
+    '2.2.0'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    '7d354d904bad591a931ad57e99fea84a'
+    '0d816b6beed31edc75babcfbf863ffa8'
 )
 
 maintainer=\
@@ -18,6 +18,11 @@ maintainer=\
     'Jose Pinto <zepinto@lsts.pt>'
 )
 
+requires=\
+(
+    'ncurses/default'
+)
+
 build()
 {
     $cmd_make
@@ -26,7 +31,15 @@ build()
 configure()
 {
     cd "../htop-$version"
-    ./configure --disable-unicode --prefix="${cfg_dir_rootfs}"
+    ./configure --disable-unicode \
+    --disable-dependency-tracking \
+    --build="$cfg_host_canonical" \
+    --host="$cfg_host_canonical" \
+    --prefix="$cfg_dir_rootfs" \
+    HTOP_NCURSESW_CONFIG_SCRIPT="$cfg_dir_toolchain_sysroot/usr/bin/ncursesw6-config" \
+    HTOP_NCURSES_CONFIG_SCRIPT="$cfg_dir_toolchain_sysroot/usr/bin/ncurses6-config" \
+    CC="$cmd_target_cc" \
+    CXX="$cmd_target_cxx"
 }
 
 target_install()

rules/kplex/default.bash

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

rules/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/libtirpc/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '1.2.6'
+    '0.2.5'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    'b25f9cc18bfad50f7c446c77f4ae00bb'
+    '8cd41a5ef5a9b50d0fb6abb98af15368'
 )
 
 maintainer=\

rules/linux-headers/cross.bash

@@ -1,16 +1,16 @@
 version=\
 (
-    '5.8.7'
+    '4.9.99'
 )
 
 url=\
 (
-    "https://www.kernel.org/pub/linux/kernel/v5.x/linux-$version.tar.xz"
+    "https://www.kernel.org/pub/linux/kernel/v4.x/linux-$version.tar.xz"
 )
 
 md5=\
 (
-    '5353de56bf4621a35afc4384c7e51f30'
+    'aecc1118040df0c18dbca9f1f163ef84'
 )
 
 maintainer=\

rules/linux/default.bash

@@ -1,16 +1,16 @@
 version=\
 (
-    '5.4'
+    '4.9.99'
 )
 
 url=\
 (
-    "https://www.kernel.org/pub/linux/kernel/v5.x/linux-$version.tar.xz"
+    "https://www.kernel.org/pub/linux/kernel/v4.x/linux-$version.tar.xz"
 )
 
 md5=\
 (
-    'ce9b2d974d27408a61c53a30d3f98fb9'
+    'aecc1118040df0c18dbca9f1f163ef84'
 )
 
 maintainer=\
@@ -23,6 +23,7 @@ requires=\
     'bc/host'
     'kmod/host'
     'lz4/host'
+#    'elfutils/default'
 )
 
 # This variable is updated by find_patches().

rules/linux/rpi.bash

@@ -2,19 +2,19 @@
 
 version=\
 (
-    '5.4'
+    '4.4_2017-01-27'
 )
 
 url=\
 (
-    "http://archive.ubuntu.com/ubuntu/pool/universe/l/linux-raspi2/linux-raspi2_$version.0.orig.tar.gz"
+    "http://lsts.pt/glued/rpi-linux-$version.zip"
 )
 
 md5=\
 (
-    '0707e4b2cbaf1428055d6615be04559e'
+    'f31d48a9d2c93509b35e750be489b44c'
 )
 
-build_dir="linux-$version"
+build_dir="rpi-linux-rpi-linux-$version"
 
 find_patches

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

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

rules/ncurses/default.bash

@@ -10,7 +10,10 @@ configure_common()
         --target="$cfg_target_canonical" \
         --host="$cfg_target_canonical" \
         --build="$cfg_host_canonical" \
+        --with-build-cc="$cmd_target_cc" \
+        --with-build-cpp="$cmd_target_cpp" \
 	--with-shared \
+  --enable-ext-colors \
 	--enable-pc-files \
 	--without-progs \
 	--without-tests \

rules/ntp/default.bash

@@ -5,7 +5,7 @@ version=\
 
 url=\
 (
-    "ftp://gentoo.mirrors.ovh.net/gentoo-distfiles/distfiles/ntp-$version.tar.gz"
+    "ftp://mirror.ovh.net/gentoo-distfiles/distfiles/ntp-$version.tar.gz"
 )
 
 md5=\

rules/opencv/default.bash

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

rules/openssl/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '1.1.1f'
+    '1.0.2e'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    '3f486f2f4435ef14b81814dbbc7b48bb'
+    '5262bfa25b60ed9de9f28d5d52d77fc5'
 )
 
 requires=\
@@ -23,7 +23,6 @@ configure()
     ./Configure linux-generic32 --cross-compile-prefix="$cfg_target_canonical-" \
                 --prefix="$cfg_dir_toolchain_sysroot/usr" \
                 --openssldir="$cfg_dir_toolchain_sysroot/usr" \
-		--libdir=lib \
                 shared
 }
 

rules/pciutils/default.bash

@@ -5,7 +5,7 @@ version=\
 
 url=\
 (
-    "ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-$version.tar.gz"
+    "http://ftp.riken.jp/Linux/kernel.org/software/utils/pciutils/pciutils-$version.tar.gz"
 )
 
 md5=\

rules/rpcbind/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '1.2.5'
+    '0.2.2'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    'ed46f09b9c0fa2d49015f6431bc5ea7b'
+    '8acf839bfef2364a05fbd6be5f8edf9a'
 )
 
 maintainer=\

rules/rpi-boot-firmware/default.bash

@@ -1,15 +1,11 @@
 version=\
 (
-    '1.20200212',
-    '2019.07',
-    '3.98ubuntu12'
+    '2017-02-02'
 )
 
 url=\
 (
-    "http://archive.ubuntu.com/ubuntu/pool/multiverse/l/linux-firmware-raspi2/linux-firmware-raspi2_$version.orig.tar.gz",
-    "http://archive.ubuntu.com/ubuntu/pool/main/u/u-boot/u-boot_$version+dfsg.orig.tar.xz",
-    "http://archive.ubuntu.com/ubuntu/pool/main/f/flash-kernel/flash-kernel_$version.tar.xz"
+    "http://lsts.pt/glued/rpi-boot-firmware-$version.zip"
 )
 
 maintainer=\
@@ -20,9 +16,7 @@ maintainer=\
 
 md5=\
 (
-    '5b35887b1026fafe8174f473679d175a',
-    '5b35887b1026fafe8174f473679d175a',
-    '5b35887b1026fafe8174f473679d175a'
+    'eb42664fce4d73f167064e697dfacb76'
 )
 
 target_install()

rules/rsync/default.bash

@@ -5,12 +5,12 @@ version=\
 
 url=\
 (
-    "http://www.samba.org/ftp/rsync/rsync-$version.tar.gz"
+    "https://github.com/WayneD/rsync/archive/v$version.tar.gz"
 )
 
 md5=\
 (
-    '43bd6676f0b404326eee2d63be3cdcfe'
+    'e559dd27216db757f4b34d64b8bf789e'
 )
 
 maintainer=\

rules/syslinux/common.bash

@@ -1,16 +1,16 @@
 version=\
 (
-    '3.82'
+    '6.04'
 )
 
 url=\
 (
-    "https://www.kernel.org/pub/linux/utils/boot/syslinux/3.xx/syslinux-$version.tar.bz2"
+    "https://mirrors.edge.kernel.org/pub/linux/utils/boot/syslinux/Testing/$version/syslinux-$version-pre1.tar.gz"
 )
 
 md5=\
 (
-    'c9f4e73e385c86b3a8faf9b615a04836'
+    'fefbc39becb619339fc22c91ec7112ab'
 )
 
 maintainer=\
@@ -22,4 +22,11 @@ requires=\
 (
     'nasm/host'
     'python_host/host'
+    'uuid/default'
 )
+
+post_unpack()
+{
+  cd ..
+  $cmd_cp syslinux-$version-pre1/* syslinux-$version/
+}

rules/syslinux/default.bash

@@ -2,9 +2,9 @@ source $pkg_common
 
 host_install()
 {
-    $cmd_make clean &&
-    $cmd_make &&
-    cp -d extlinux/extlinux ${cfg_dir_toolchain}/bin/extlinux
+    $cmd_make_single clean &&
+    $cmd_make_single CC="$cmd_target_cc" &&
+    cp -d bios/extlinux/extlinux ${cfg_dir_toolchain}/bin/extlinux
 }
 
 target_install()
@@ -19,11 +19,11 @@ target_install()
         export cfg_kernel_boot_dev='/dev/sda1'
     fi
 
-    $cmd_make clean &&
-    $cmd_make CC="$cmd_target_cc" &&
-    $cmd_target_strip extlinux/extlinux -o $cfg_dir_rootfs/usr/sbin/extlinux &&
+    $cmd_make_single clean &&
+    $cmd_make_single CC="$cmd_target_cc" &&
+    $cmd_target_strip bios/extlinux/extlinux -o $cfg_dir_rootfs/usr/sbin/extlinux &&
     $cmd_mkdir $cfg_dir_rootfs/boot/extlinux &&
-    cp -d mbr/mbr.bin $cfg_dir_rootfs/boot/extlinux &&
+    cp -d bios/mbr/mbr.bin $cfg_dir_rootfs/boot/extlinux &&
     (echo $console ; cat "$pkg_dir"/extlinux.conf) \
          | sed "s%\$cfg_kernel_extra_args%$cfg_kernel_extra_args%g" \
          | sed "s%\$cfg_kernel_boot_dev%$cfg_kernel_boot_dev%g" \

rules/syslinux/host.bash

@@ -2,9 +2,9 @@ source $pkg_common
 
 host_install()
 {
-    $cmd_make clean &&
-    $cmd_make &&
-    cp -d extlinux/extlinux ${cfg_dir_toolchain}/bin &&
+    $cmd_make_single clean &&
+    $cmd_make_single CC="$cmd_target_cc" &&
+    cp -d bios/extlinux/extlinux ${cfg_dir_toolchain}/bin &&
     mkdir -p ${cfg_dir_toolchain}/boot &&
-    cp -d mbr/mbr.bin ${cfg_dir_toolchain}/boot/mbr.bin
+    cp -d bios/mbr/mbr.bin ${cfg_dir_toolchain}/boot/mbr.bin
 }

rules/uuid/default.bash

@@ -0,0 +1,10 @@
+maintainer=\
+(
+    'Pedro Gonçalves <pedro@lsts.pt>'
+)
+
+host_install()
+{
+  cp -rv $cfg_dir_toolchain/include/uuid $cfg_dir_toolchain_sysroot/usr/include/
+  $cmd_cp $cfg_dir_toolchain/lib/libuuid* $cfg_dir_toolchain_sysroot/usr/lib/
+}

rules/zerotier/default.bash

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

systems/lauv-atom/aries-atom-testbed.cfg

@@ -0,0 +1,2 @@
+cfg_hostname='aries-atom-testbed'
+cfg_eth_ext_ip='10.0.200.66'

systems/lauv-atom/lauv-atom-testbed.cfg

@@ -1,2 +0,0 @@
-cfg_hostname='lauv-atom-testbed'
-cfg_eth_ext_ip='10.0.200.92'

systems/lauv-atom/patches/linux/4.9/00-aim104-com8.patch

@@ -0,0 +1,85 @@
+diff -Nru a/drivers/tty/serial/8250/8250_aim104_com8.c b/drivers/tty/serial/8250/8250_aim104_com8.c
+--- a/drivers/tty/serial/8250/8250_aim104_com8.c	1970-01-01 01:00:00.000000000 +0100
++++ b/drivers/tty/serial/8250/8250_aim104_com8.c	2012-05-31 13:13:13.794585528 +0100
+@@ -0,0 +1,51 @@
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/serial_8250.h>
++
++#define PORT(_base,_irq)				\
++	{						\
++		.iobase		= _base,		\
++		.irq		= _irq,			\
++		.uartclk	= 1843200,		\
++		.iotype		= UPIO_PORT,		\
++		.flags		= UPF_BOOT_AUTOCONF | UPF_BUGGY_UART,	\
++	}
++
++static struct plat_serial8250_port aim104_data[] = {
++	PORT(0x100, 10),
++	PORT(0x108, 10),
++	PORT(0x110, 10),
++	PORT(0x118, 10),
++	PORT(0x120, 10),
++	PORT(0x128, 10),
++	PORT(0x130, 10),
++	PORT(0x138, 10),
++	PORT(0x300, 6),
++	PORT(0x308, 6),
++	PORT(0x310, 6),
++	PORT(0x318, 6),
++	PORT(0x320, 6),
++	PORT(0x328, 6),
++	PORT(0x330, 6),
++	PORT(0x338, 6),
++	{ },
++};
++
++static struct platform_device exar_device = {
++	.name			= "serial8250",
++	.id			= PLAT8250_DEV_PLATFORM,
++	.dev			= {
++		.platform_data	= aim104_data,
++	},
++};
++
++static int __init exar_init(void)
++{
++	return platform_device_register(&exar_device);
++}
++
++module_init(exar_init);
++
++MODULE_AUTHOR("Ricardo Martins");
++MODULE_DESCRIPTION("8250 serial probe module for Eurotech AIM104-COM8");
++MODULE_LICENSE("GPL");
+diff -Nru a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
+--- a/drivers/tty/serial/8250/Kconfig	2012-05-21 19:42:51.000000000 +0100
++++ b/drivers/tty/serial/8250/Kconfig	2012-05-31 13:14:45.942587436 +0100
+@@ -202,6 +202,15 @@
+ 	  To compile this driver as a module, choose M here: the module
+ 	  will be called 8250_exar_st16c554.
+
++config SERIAL_8250_AIM104_COM8
++	tristate "Support Eurotech AIM104-COM8 Dual Quad UART"
++	depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
++	help
++	  Eurotech AIM104-COM8 Dual Quad UART.
++
++	  To compile this driver as a module, choose M here: the module
++	  will be called 8250_aim104_com8.
++
+ config SERIAL_8250_HUB6
+ 	tristate "Support Hub6 cards"
+ 	depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
+diff -Nru a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile
+--- a/drivers/tty/serial/8250/Makefile	2012-05-21 19:42:51.000000000 +0100
++++ b/drivers/tty/serial/8250/Makefile	2012-05-31 13:15:15.366347016 +0100
+@@ -14,6 +14,7 @@
+ obj-$(CONFIG_SERIAL_8250_ACCENT)	+= 8250_accent.o
+ obj-$(CONFIG_SERIAL_8250_BOCA)		+= 8250_boca.o
+ obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554)	+= 8250_exar_st16c554.o
++obj-$(CONFIG_SERIAL_8250_AIM104_COM8)	+= 8250_aim104_com8.o
+ obj-$(CONFIG_SERIAL_8250_HUB6)		+= 8250_hub6.o
+ obj-$(CONFIG_SERIAL_8250_MCA)		+= 8250_mca.o
+ obj-$(CONFIG_SERIAL_8250_FSL)		+= 8250_fsl.o

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

systems/lctr-a6xx/geode-testbed.cfg

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

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

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

systems/lctr-a72xx/cfg/firmware/cmdline.txt

@@ -1 +0,0 @@
-net.ifnames=0 dwc_otg.lpm_enable=0 console=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=deadline rootwait

systems/lctr-a72xx/cfg/firmware/config.txt

@@ -1,51 +0,0 @@
-# For more options and information see 
-# http://www.raspberrypi.org/documentation/configuration/config-txt.md
-# Some settings may impact device functionality. See link above for details
-
-kernel=uboot.bin
-device_tree_address=0x02000000
-
-# enable i2c
-dtparam=i2c_arm=on
-dtparam=spi=on
-
-# uncomment if you get no picture on HDMI for a default "safe" mode
-#hdmi_safe=1
-
-# uncomment this if your display has a black border of unused pixels visible
-# and your display can output without overscan
-#disable_overscan=1
-
-# uncomment the following to adjust overscan. Use positive numbers if console
-# goes off screen, and negative if there is too much border
-#overscan_left=16
-#overscan_right=16
-#overscan_top=16
-#overscan_bottom=16
-
-# uncomment to force a console size. By default it will be display's size minus
-# overscan.
-#framebuffer_width=1280
-#framebuffer_height=720
-
-# uncomment if hdmi display is not detected and composite is being output
-#hdmi_force_hotplug=1
-
-# uncomment to force a specific HDMI mode (this will force VGA)
-#hdmi_group=1
-#hdmi_mode=1
-
-# uncomment to force a HDMI mode rather than DVI. This can make audio work in
-# DMT (computer monitor) modes
-#hdmi_drive=2
-
-# uncomment to increase signal to HDMI, if you have interference, blanking, or
-# no display
-#config_hdmi_boost=4
-
-# uncomment for composite PAL
-#sdtv_mode=2
-
-#uncomment to overclock the arm. 700 MHz is the default.
-#arm_freq=800
-