Merge branch 'feature/raspicam' into feature/test_rpi

rules/base/host.bash

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

rules/linux/rpi.bash

@@ -2,21 +2,19 @@
 
 version=\
 (
-    '3.18_2015-06-03'
+    '4.4_2017-01-27'
 )
 
 url=\
 (
-    "https://github.com/rasmartins/rpi-linux/archive/rpi-linux-$version.tar.gz"
+    "http://lsts.pt/glued/rpi-linux-$version.zip"
 )
 
 md5=\
 (
-    '0b0255e50ca358b619bb78653ac2db2e'
+    'f31d48a9d2c93509b35e750be489b44c'
 )
 
-post_unpack()
+build_dir="rpi-linux-rpi-linux-$version"
-{
+
-    rmdir "../linux-$version" &&
+find_patches
-        mv "../rpi-linux-rpi-linux-$version" "../linux-$version"
-}

rules/raspicam/default.bash

@@ -0,0 +1,54 @@
+version=\
+(
+    "1.0.0"
+)
+
+url=\
+(
+    "http://lsts.pt/glued/raspicam-$version.zip"
+)
+
+md5=\
+(
+  "169e62fd17d41455a42711a2f9c54fd1"
+)
+
+maintainer=\
+(
+    'Pedro Gonçalves <pedro@lsts.pt>'
+)
+
+configure()
+{
+    LINKER_ADDED_FLAGS="-Wl,-rpath,${cfg_dir_rootfs}/usr/lib"
+
+    ${cfg_dir_toolchain}/usr/local/bin/cmake \
+        -DCMAKE_SYSTEM_NAME="Linux" \
+        -DCMAKE_SYSTEM_VERSION="1" \
+        -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_LIBRARY=ONLY \
+        -DCMAKE_C_COMPILER="${cmd_target_cc}" \
+        -DCMAKE_CXX_COMPILER="${cmd_target_cxx}" \
+        -DCMAKE_C_FLAGS="${cfg_target_gcc_flags}" \
+	.
+}
+
+build()
+{
+    $cmd_make VERBOSE=1
+}
+
+host_install()
+{
+    cd build/
+    $cmd_cp -r "lib/"* "$cfg_dir_toolchain_sysroot/usr/lib/"
+    $cmd_cp -r "inc/"* "$cfg_dir_toolchain_sysroot/usr/include/"
+}
+
+target_install()
+{
+    cd build/
+    $cmd_cp -r "lib/"* "$cfg_dir_rootfs/usr/lib/"
+    $cmd_cp -r "bin/"* "$cfg_dir_rootfs/usr/bin/"
+}

rules/rpi-boot-firmware/default.bash

@@ -1,31 +1,29 @@
 version=\
 (
-    '2015-06-03'
+    '2017-02-02'
 )
 
 url=\
 (
-    "https://github.com/rasmartins/rpi-boot-firmware/archive/rpi-boot-firmware-$version.tar.gz"
+    "http://lsts.pt/glued/rpi-boot-firmware-$version.zip"
 )
 
 maintainer=\
 (
     'Ricardo Martins <rasm@fe.up.pt>'
+    'Pedro Gonçalves <pedro@lsts.pt>'
 )
 
 md5=\
 (
-    'a80ee36b66cccda4e9ccb7eb26bd6bb8'
+    'eb42664fce4d73f167064e697dfacb76'
 )
 
 target_install()
 {
-    $cmd_mkdir \
+    $cmd_mkdir "$cfg_dir_rootfs/boot"
-        "$cfg_dir_rootfs/boot" &&
 
-    for f in bootcode.bin fixup.dat start.elf; do
+    $cmd_cp "../$pkg-$version/"* "$cfg_dir_rootfs/boot/"
-        $cmd_cp -r "../$pkg-$pkg-$version/$f" "$cfg_dir_rootfs/boot"
-    done &&
 
     tar -C "$pkg_dir/fs" -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }

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

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

rules/uv4l/default.bash

@@ -0,0 +1,45 @@
+version=\
+(
+  "1.0.0"
+)
+
+url=\
+(
+  "http://lsts.pt/glued/uv4l.$version.tar.bz2"
+)
+
+md5=\
+(
+  "869e884accbfa9c2356e2fd9307dd71c"
+)
+
+maintainer=\
+(
+    'Pedro Gonçalves <pedro@lsts.pt>'
+)
+
+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 20 --quality 10 --server-option '--port=9090' --server-option '--max-queued-connections=30' --server-option '--max-streams=25' --server-option '--max-threads=29'" >> startStreamRaspiCam.sh
+}
+
+host_install()
+{
+  $cmd_cp -r "usr/lib/"*    "$cfg_dir_toolchain_sysroot/usr/lib/"
+  $cmd_cp -r "usr/include/"* "$cfg_dir_toolchain_sysroot/usr/include/"
+}
+
+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/"
+}
+
+

systems/lauv-aux-rpi/config

@@ -6,13 +6,12 @@ cfg_services1='lauv-storage-server'
 cfg_services2='dune'
 cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind nfs-utils rpi-boot-firmware linux/rpi'
 cfg_target_linux_kernel='arch/arm/boot/zImage'
-cfg_target_linux_dtb='arch/arm/boot/dts/bcm2709-rpi-2-b.dtb'
 cfg_ptpd_interface='eth0'
 cfg_terminal='ttyAMA0'
 cfg_lauv_storage_dir='/opt/lsts/dune/log'
 cfg_partitions=\
 (
-    rpi-boot boot0  512B    32MiB
+    rpi-boot BOOT0  512B    32MiB
     root     root0  32MiB   544MiB
     data     data0  544MiB  -1
 )

systems/lauv-aux-rpi/fs/boot/config.txt

@@ -1 +1,9 @@
+# Core.
 arm_freq=1000
+
+# Disable BT on Rpi3.
+dtoverlay=pi3-disable-bt
+
+# Enable RasPicam
+start_x=1
+gpu_mem=128

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

@@ -3,3 +3,4 @@ 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_services1=''

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

@@ -0,0 +1,10 @@
+cfg_hostname='test-rpi'
+cfg_eth_ext_ip='10.0.10.116'
+cfg_eth_ext_mk='255.255.0.0'
+cfg_eth_ext_gw='10.0.0.1'
+cfg_ptpd_interface='eth0'
+cfg_services1=''
+cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd ntp rpcbind nfs-utils rpi-boot-firmware linux/rpi raspicam libjpeg-turbo v4l-utils uv4l'
+cfg_modules="$cfg_modules ftdi_sio"
+cfg_terminal='tty1'
+