rules: gdal: Correctly install to sysroot

.gitignore

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

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'

docker/Makefile

@@ -23,10 +23,9 @@
 TAG     := glued
 VERSION := 2016.05.0
 VOLUME  := $(CURDIR)/..
-DNS	:= 8.8.8.8
 
 all:
 	docker build -t $(TAG):$(VERSION) .
 
 shell:
-	docker run -w $(VOLUME) --dns=$(DNS) -i -a stdin -a stdout -v $(VOLUME):$(VOLUME) -t $(TAG):$(VERSION)
+	docker run -w $(VOLUME) -i -a stdin -a stdout -v $(VOLUME):$(VOLUME) -t $(TAG):$(VERSION)

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    #

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://lsts.pt/glued/$(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/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/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/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/gdal/default.bash

@@ -0,0 +1,49 @@
+version=\
+(
+    '2.3.2'
+)
+
+url=\
+(
+    "http://download.osgeo.org/gdal/2.3.2/gdal-2.3.2.tar.gz"
+)
+
+md5=\
+(
+    '221e4bfe3e8e9443fd33f8fe46f8bf60'
+)
+
+maintainer=\
+(
+    'Tiago Sá Marques <tsmarques@lsts.pt>'
+)
+
+configure()
+{
+    "./configure" \
+        --prefix="$cfg_dir_toolchain_sysroot/usr" \
+        --target="$cfg_target_canonical" \
+        --host="$cfg_target_canonical" \
+        --build="$cfg_host_canonical" \
+        --includedir="$cfg_dir_toolchain_sysroot/usr/include/gdal" \
+        --with-build-sysroot="$cfg_dir_toolchain_sysroot" \
+        --with-sysroot="$cfg_dir_toolchain_sysroot"
+}
+
+build()
+{
+    $cmd_make
+}
+
+host_install()
+{
+    $cmd_make install
+}
+
+target_install()
+{
+    cp -a "$cfg_dir_toolchain_sysroot/usr/lib/"libgdal*so* $cfg_dir_rootfs/lib
+    for f in "$cfg_dir_rootfs/lib/"libgdal*so; do
+        $cmd_target_strip "$f"
+    done
+}

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/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/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-aux-rpi/lauv-nemo-1-aux.cfg

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

systems/lctr-a6xx/geode-testbed.cfg

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

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
-

systems/lctr-a72xx/config

@@ -1,19 +0,0 @@
-cfg_architecture='cortex-a72'
-cfg_storage='data0:ext4:/opt'
-cfg_services0='dropbear network storage upgrade syslog ptpd'
-cfg_services1=''
-cfg_services2='dune'
-cfg_modules=''
-cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind rpi-boot-firmware bison binutils openssl linux/rpi exiftool libusb'
-cfg_target_linux_kernel='arch/arm/boot/zImage'
-cfg_ptpd_interface='eth0'
-cfg_eth_ext_mk='255.255.0.0'
-cfg_eth_ext_gw='10.0.0.1'
-cfg_terminal='tty1'
-cfg_partitions=\
-(
-    rpi-boot BOOT0  512B    32MiB
-    root     root0  32MiB   544MiB
-    data     data0  544MiB  -1
-)
-

systems/lctr-a72xx/lctr-a72xx-testbed.cfg

@@ -1,3 +0,0 @@
-cfg_hostname="lctr-a72xx-testbed"
-cfg_eth_ext_ip="10.0.200.18"
-cfg_kernel_boot_dev='/dev/mmcblk0p1'

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 exiftool libusb'
+cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind rpi-boot-firmware linux/rpi'
 cfg_target_linux_kernel='arch/arm/boot/zImage'
 cfg_ptpd_interface='eth0'
 cfg_eth_ext_mk='255.255.0.0'

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

@@ -1,9 +0,0 @@
-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 libusb'
-cfg_services0='network dropbear storage upgrade syslog ptpd'
-cfg_modules="$cfg_modules ftdi_sio"
-cfg_terminal='tty1'
-cfg_ptpd_interface='eth0'
-

systems/lctr-rpi/x8-06-aux.cfg

@@ -1,7 +1,7 @@
 cfg_hostname='x8-06-aux'
 cfg_eth_ext_ip='10.0.20.109'
 cfg_services1='lauv-storage-server'
-cfg_packages="$cfg_packages opencv raspicam exiv2 libav uswitch nfs-utils"
+cfg_packages="$cfg_packages opencv raspicam exiv2 libav uswitch nfs-utils gdal"
 cfg_modules="$cfg_modules ftdi_sio"
 cfg_target_linux_dtb='arch/arm/boot/dts/am335x-lauv-aux.dtb'
 cfg_ptpd_interface='eth0'

utils/glued-check-sources.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    #

utils/glued-download-sources.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    #