rules/make/host: update version/package to fix bug in make.

Feature/exiftool

docker/Dockerfile

@@ -36,6 +36,3 @@ 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 bison
-RUN apt-get install -y flex
-RUN apt-get install -y libssl-dev

rules/curl/default.bash

@@ -35,6 +35,11 @@ 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/filesystem/fs/etc/rc.d/mount_sdcard_cm3

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

rules/gcc/common.bash

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

rules/kplex/default.bash

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

rules/linux-headers/cross.bash

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

rules/linux/default.bash

@@ -196,10 +196,10 @@ target_install()
         KBUILD_VERBOSE=1 \
         modules_install
 
-    #$cmd_make \
-    #    CROSS_COMPILE="$cfg_target_canonical-" \
-    #    ARCH="$cfg_target_linux" \
-    #    INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
-    #    KBUILD_VERBOSE=1 \
-    #    firmware_install
+    $cmd_make \
+        CROSS_COMPILE="$cfg_target_canonical-" \
+        ARCH="$cfg_target_linux" \
+        INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
+        KBUILD_VERBOSE=1 \
+        firmware_install
 }

rules/linux/rpi.bash

@@ -2,7 +2,7 @@
 
 version=\
 (
-    '4.19_2019-07-29'
+    '4.4_2017-01-27'
 )
 
 url=\
@@ -12,7 +12,7 @@ url=\
 
 md5=\
 (
-    'a9fac458f26bf4a3f3d9c981c7e51dd9'
+    'f31d48a9d2c93509b35e750be489b44c'
 )
 
 build_dir="rpi-linux-rpi-linux-$version"

rules/make/host.bash

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

rules/ncurses/common.bash

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

rules/opencv/default.bash

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

rules/rpi-boot-firmware/default.bash

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

rules/zerotier/default.bash

@@ -0,0 +1,34 @@
+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/lctr-rpi/config

@@ -3,7 +3,7 @@ cfg_storage='data0:ext4:/opt'
 cfg_modules=''
 cfg_services0='network dropbear storage upgrade syslog ptpd'
 cfg_services2='dune'
-cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind rpi-boot-firmware linux/rpi'
+cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind rpi-boot-firmware linux/rpi exiftool libusb'
 cfg_target_linux_kernel='arch/arm/boot/zImage'
 cfg_ptpd_interface='eth0'
 cfg_eth_ext_mk='255.255.0.0'

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

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

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

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

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

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