pktoolchain: added prefix to base folder.

.gitignore

@@ -1,8 +1,8 @@
-downloads
+/downloads
-lctr-a4xx
+/lctr-a4xx
-lctr-a6xx
+/lctr-a6xx
-lctr-a8xx
+/lctr-a8xx
-lctr-a9xx
+/lctr-a9xx
-lctr-b1xx
+/lctr-b1xx
-lctr-b2xx
+/lctr-b2xx
-qemu-i686
+/qemu-i686

mkconfig.bash

@@ -21,7 +21,7 @@
 ###########################################################################
 
 # Config: GLUED version.
-cfg_glued_version='1.9.9'
+cfg_glued_version='1.9.13'
 # Config: GLUED vendor.
 cfg_glued_vendor='lsts'
 

packages/apache-ant/host.bash

@@ -5,7 +5,7 @@ version=\
 
 url=\
 (
-    "http://www.eu.apache.org/dist/ant/binaries/apache-ant-$version-bin.tar.bz2"
+    "http://www.lsts.pt/glued/apache-ant-$version-bin.tar.bz2"
 )
 
 md5=\

packages/escc/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '1.0.3'
+    '1.0.6'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    'd8729636cc2d7f46f62141d392898bfa'
+    '07783e66e27601ab0a8250c328b3d6bf'
 )
 
 if [ -d "$cfg_dir_builds/linux/linux-"* ]; then
@@ -25,7 +25,7 @@ build()
         M=`pwd` \
         -C "$kernel" &&
 
-    for util in setescc esccclock esccsettings; do
+    for util in setescc esccclock esccsettings esccfs6131; do
         make CC="$cmd_target_cc" -C "utils/$util"
     done
 }
@@ -40,7 +40,7 @@ target_install()
         -C "$kernel" \
         modules_install &&
 
-    for util in setescc esccclock esccsettings; do
+    for util in setescc esccclock esccsettings esccfs6131; do
         $cmd_target_strip "utils/$util/$util" -o "$cfg_dir_rootfs/usr/bin/$util"
     done &&
 

packages/escc/fs/etc/escc/hg1700-psimar.sh

@@ -1,9 +1,15 @@
-# IMU
+# Channels:
-/usr/bin/setescc 0 0x200 5 0 0 0
+# * 0: Honeywell HG1700
-/usr/bin/esccclock 0 0x5d1460 23
+# * 1: LSTS PSIMAR
-/usr/bin/esccsettings 0 /etc/escc/hg1700.cfg
 
-# PSIMAR
+# Create channels.
+/usr/bin/setescc 0 0x200 5 0 0 0
 /usr/bin/setescc 1 0x200 5 0 0 1
+
+# Set clocks (Hz).
+"$cmd_escc_set_clock" 0 1000000
+"$cmd_escc_set_clock" 1 25804800
+
+# Set registers.
+/usr/bin/esccsettings 0 /etc/escc/hg1700.cfg
 /usr/bin/esccsettings 1 /etc/escc/psimar.cfg
-/usr/bin/esccclock 1 0xc8920 22

packages/escc/fs/etc/escc/hg1700.sh

@@ -1,3 +1,11 @@
+# Channels:
+# * 0: Honeywell HG1700
+
+# Create channels.
 /usr/bin/setescc 0 0x200 5 0 0 0
-/usr/bin/esccclock 0 0x5d1460 23
+
+# Set clocks (Hz).
+"$cmd_escc_set_clock" 0 1000000
+
+# Set registers.
 /usr/bin/esccsettings 0 /etc/escc/hg1700.cfg

packages/escc/fs/etc/escc/ifog-imu-1-a.sh

@@ -1,8 +1,14 @@
-# IMU
+# Channels:
-/usr/bin/setescc 0 0x200 5 0 0 0
+# * 0: iMAR iFOG-IMU-1-A
-/usr/bin/esccsettings 0 /etc/escc/ifog-imu-1-a.cfg
+# * 1: LSTS PSIMAR
 
-# PSIMAR
+# Create channels.
+/usr/bin/setescc 0 0x200 5 0 0 0
 /usr/bin/setescc 1 0x200 5 0 0 1
+
+# Set clock.
+"$cmd_escc_set_clock" 1 25804800
+
+# Set registers.
+/usr/bin/esccsettings 0 /etc/escc/ifog-imu-1-a.cfg
 /usr/bin/esccsettings 1 /etc/escc/psimar.cfg
-/usr/bin/esccclock 1 0xc8920 22

packages/escc/fs/etc/rc.d/escc

@@ -5,6 +5,14 @@ start()
     mknod /dev/escc0 c 261 0 &&
     rm -f /dev/escc1 &&
     mknod /dev/escc1 c 261 1 &&
+
+    # Clock command.
+    if [ -z "$cfg_escc_et" ]; then
+        cmd_escc_set_clock='/usr/bin/esccclock'
+    else
+        cmd_escc_set_clock='/usr/bin/esccfs6131'
+    fi &&
+
     if [ -f "$cfg_escc_script" ]; then
         source "$cfg_escc_script"
     fi

packages/filesystem/fs/etc/rc.d/mobile-internet

@@ -1,192 +0,0 @@
-#! /bin/sh
-#############################################################################
-# Copyright (C) 2012 Laboratório de Sistemas e Tecnologia Subaquática       #
-# Departamento de Engenharia Electrotécnica e de Computadores               #
-# Rua Dr. Roberto Frias, 4200-465 Porto, Portugal                           #
-#############################################################################
-# Author: Ricardo Martins                                                   #
-#############################################################################
-
-GSM_USER='vodafone'
-GSM_PASS='vodafone'
-GSM_APN='internet.vodafone.pt'
-GSM_MODE='AT\^SYSCFG=2,2,3fffffff,0,1'
-GSM_PIN='AT'
-
-FWL_EXT_ITF='ppp0'
-FWL_INT_ITF='eth0'
-
-CHAT_SCRIPT=$(cat <<EOF
-ABORT 'BUSY' \
-ABORT 'NO CARRIER' \
-ABORT 'VOICE' \
-ABORT 'NO DIALTONE' \
-ABORT 'NO DIAL TONE' \
-ABORT 'NO ANSWER' \
-ABORT 'DELAYED' \
-REPORT CONNECT \
-TIMEOUT 6 \
-'' 'ATQ0' \
-'OK-AT-OK' 'ATZ' \
-TIMEOUT 3 \
-'OK' '$GSM_PIN' \
-'OK-AT-OK' 'ATI' \
-'OK' 'ATZ' \
-'OK' 'ATQ0 V1 E1 S0=0 &C1 &D2 +FCLASS=0' \
-'OK' '$GSM_MODE' \
-'OK-AT-OK' 'AT+CGDCONT=1,\"IP\",\"$GSM_APN\"' \
-'OK' 'ATDT*99***1#' \
-TIMEOUT 30 \
-CONNECT ''
-EOF
-)
-
-modem_probe()
-{
-    nr="$(cat /proc/tty/driver/usbserial | grep GSM | head -n 1 | cut -f1 -d:)"
-    if [ -z "$nr" ]; then
-        echo ""
-    else
-        echo "/dev/ttyUSB$nr"
-    fi
-}
-
-ppp_start()
-{
-    modem="$(modem_probe)"
-
-    if [ -z "$modem" ]; then
-        echo -e "\nERROR: failed to find GSM modem.\n"
-        exit 1
-    fi
-
-    auth=''
-    if [ -n "$GSM_USER" ] && [ -n "$GSM_PASS" ]; then
-        auth="user \"$GSM_USER\" password \"$GSM_PASS\""
-    fi
-
-    echo -e "\n* Removing default route"
-
-    /sbin/route del default dev eth0 > /dev/null 2>&1
-
-    echo -e "\n* Starting PPP"
-
-    /usr/sbin/pppd \
-        "$modem" \
-        921600 \
-        $auth \
-        lock \
-        crtscts \
-        modem \
-        passive \
-        novj \
-        defaultroute \
-        noipdefault \
-        usepeerdns \
-        noauth \
-        hide-password \
-        persist \
-        holdoff 10 \
-        maxfail 2 \
-        updetach \
-        connect "/usr/sbin/chat -E -v -t15 $CHAT_SCRIPT" > /var/run/ppp.log 2>&1
-
-    if [ $? -ne 0 ]; then
-        echo -e "\nERROR: PPP failed to establish a connection.\n"
-        exit 1
-    fi
-
-    ip=$(ifconfig ppp0 | grep inet | cut -f2 -d: | cut -f1 -d' ')
-    echo "  - External IP is $ip"
-}
-
-ppp_stop()
-{
-    pid="$(cat /var/run/ppp0.pid 2> /dev/null)"
-
-    echo -e "\n* Stopping PPP"
-
-    if [ -z "$pid" ]; then
-        echo "  - Daemon is not running"
-        return 0
-    fi
-
-    for n in 1 2 3 4 5; do
-        if ! [ -d "/proc/$pid" ]; then
-            echo "  - Daemon stopped"
-            return 0
-        fi
-
-        echo "  - Sending SIGTERM to '$pid' (try $n)"
-        kill "$pid" > /dev/null 2>&1
-        sleep 2
-    done
-
-    kill -9 "$pid" > /dev/null 2>&1
-    echo "  - Daemon terminated"
-    return 0
-}
-
-nat_start()
-{
-    echo -e "\n* Enabling NAT"
-
-    echo "  - Enabling IP forwarding"
-    echo '1' > /proc/sys/net/ipv4/ip_forward
-    echo '1' > /proc/sys/net/ipv4/ip_dynaddr
-
-    echo "  - Flushing rules"
-    iptables -P INPUT ACCEPT
-    iptables -F INPUT
-    iptables -P OUTPUT ACCEPT
-    iptables -F OUTPUT
-    iptables -P FORWARD DROP
-    iptables -F FORWARD
-    iptables -t nat -F
-
-    echo "  - Installing rules"
-    iptables -A FORWARD -i "$FWL_EXT_ITF" -o "$FWL_INT_ITF" -m state --state ESTABLISHED,RELATED -j ACCEPT
-    iptables -A FORWARD -i "$FWL_EXT_ITF" -o "$FWL_EXT_ITF" -j ACCEPT
-    iptables -A FORWARD -i "$FWL_EXT_ITF" -o "$FWL_INT_ITF" -j ACCEPT
-    iptables -A FORWARD -i "$FWL_INT_ITF" -o "$FWL_EXT_ITF" -j ACCEPT
-    iptables -A FORWARD -j LOG
-    iptables -t nat -A POSTROUTING -o "$FWL_EXT_ITF" -j MASQUERADE
-}
-
-nat_stop()
-{
-    echo -e "\n* Disabling NAT"
-
-    echo "  - Disabling IP forwarding"
-    echo '0' > /proc/sys/net/ipv4/ip_forward
-    echo '0' > /proc/sys/net/ipv4/ip_dynaddr
-
-    echo "  - Flushing NAT rules"
-    iptables -P INPUT ACCEPT
-    iptables -F INPUT
-    iptables -P OUTPUT ACCEPT
-    iptables -F OUTPUT
-    iptables -P FORWARD DROP
-    iptables -F FORWARD
-    iptables -t nat -F
-}
-
-start()
-{
-    ppp_start && nat_start
-    if [ $? -eq 0 ]; then
-        echo -e "\n* Connection Established\n"
-    else
-        echo -e "\nERROR: failed to establish a connection\n"
-    fi
-}
-
-stop()
-{
-    nat_stop && ppp_stop
-    if [ $? -eq 0 ]; then
-        echo -e "\n* Service stopped\n"
-    else
-        echo -e "\nERROR: failed to stop service.\n"
-    fi
-}

packages/filesystem/fs/etc/rc.d/upgrade

@@ -6,8 +6,6 @@
 #############################################################################
 # Author: Ricardo Martins                                                   #
 #############################################################################
-# $Id:: upgrade 1244 2012-10-08 07:21:07Z rasm                            $:#
-#############################################################################
 
 base='/opt/lsts/glued'
 hostname="$(hostname)"
@@ -111,6 +109,68 @@ kernel_upgrade()
     fi
 }
 
+uboot_part_upgrade()
+{
+    label="$1"
+    dev="$2"
+
+    echo -en "* $label: probing bootloader partition... "
+    if ! [ -b "$dev" ]; then
+        echo 'not present'
+        return 0
+    fi
+    echo 'present'
+
+    echo -en "* $label: mounting bootloader partition... "
+    mount -t vfat "$dev" /mnt > /dev/null 2>&1
+    if [ $? -ne 0 ]; then
+        echo "failed"
+        return 0
+    fi
+    echo 'done'
+
+    for f in MLO u-boot.img; do
+        echo -en "* $label: Replacing $f... "
+        cp "$base/.glued-new/boot/$f" /mnt
+        echo 'done'
+    done
+
+    echo -en "* $label: unmounting bootloader partition... "
+    umount /mnt > /dev/null 2>&1
+    if [ $? -ne 0 ]; then
+        echo 'failed'
+        return  1
+    fi
+
+    sync && sync && sync && sync
+    echo 'done'
+    return 0
+}
+
+uboot_part_upgrade_check()
+{
+    # Check if board is a BeagleBone black.
+    dmesg | grep -i 'machine model' | grep -i beaglebone > /dev/null 2>&1
+    if [ $? -eq 0 ]; then
+        uboot_part_upgrade 'BeagleBone Black' '/dev/mmcblk1p1'
+        return 0
+    fi
+
+    # Check if board is a IGEPv2.
+    dmesg | grep -i 'machine model' | grep -i igepv2 > /dev/null 2>&1
+    if [ $? -eq 0 ]; then
+        uboot_part_upgrade 'IGEPv2' '/dev/mmcblk0p1'
+        return 0
+    fi
+    dmesg | grep Machine | grep 'IGEP v2' > /dev/null 2>&1
+    if [ $? -eq 0 ]; then
+        uboot_part_upgrade 'IGEPv2' '/dev/mmcblk0p1'
+        return 0
+    fi
+
+    return 0
+}
+
 old_move()
 {
     echo "* Mounting rootfs read-write..."
@@ -158,6 +218,7 @@ start()
     version || return 1
     kernel_dst || return 1
     new_unpack || return 1
+    uboot_part_upgrade_check || return 1
     kernel_upgrade || return 1
     old_move || return 1
 }

packages/filesystem/target.bash

@@ -11,7 +11,7 @@ maintainer=\
 target_install()
 {
     $cmd_mkdir \
-        "$cfg_dir_rootfs"/{dev,boot,proc,sys,etc,bin,sbin,opt,var,root} \
+        "$cfg_dir_rootfs"/{dev,boot,proc,sys,etc,bin,sbin,opt,var,mnt,root} \
         "$cfg_dir_rootfs"/usr/{bin,sbin,lib,lib/firmware} \
         "$cfg_dir_rootfs"/opt \
         "$cfg_dir_rootfs"/dev/{shm,pts} \

packages/gdb/common.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '7.5.1'
+    '7.7.1'
 )
 
 url=\
@@ -10,5 +10,5 @@ url=\
 
 md5=\
 (
-    '3f48f468b24447cf24820054ff6e85b1'
+    '77b20b515e7c25f032cb9732a66620fe'
 )

packages/rsync/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '3.1.0'
+    '3.1.1'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    '3be148772a33224771a8d4d2a028b132'
+    '43bd6676f0b404326eee2d63be3cdcfe'
 )
 
 maintainer=\

packages/zip/host.bash

@@ -5,7 +5,7 @@ version=\
 
 url=\
 (
-    "ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz"
+    "http://downloads.sourceforge.net/infozip/Zip%203.x%20%28latest%29/3.0/zip30.tar.gz"
 )
 
 md5=\

pktoolchain.bash

@@ -27,10 +27,13 @@ fi
 
 source "$1"
 
+toolchain_prefix="glued-$cfg_glued_version-$cfg_sys_family-toolchain-$cfg_host_canonical-$cfg_target_canonical"
+
 tar \
     -v \
     -j \
     -c \
+    --transform="s,^\./,$toolchain_prefix/," \
     -C "$cfg_dir_toolchain" \
     -f "$cfg_toolchain_tar" \
     .

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

@@ -122,7 +122,8 @@ CONFIG_ANON_INODES=y
 CONFIG_EXPERT=y
 # CONFIG_UID16 is not set
 # CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_KALLSYMS is not set
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y

systems/lctr-a6xx/config

@@ -4,7 +4,7 @@ cfg_services0='dropbear network storage upgrade escc syslog ptpd setserial rsync
 cfg_services1=''
 cfg_services2='dune'
 cfg_modules=''
-cfg_packages='zlib dropbear rsync busybox flashrom e2fsprogs socat linux escc syslinux syslinux/host ptpd ntp util-linux/ldattach uswitch pciutils apache-ant/host bzip2 libantlr3c boost europa'
+cfg_packages='zlib dropbear rsync busybox flashrom e2fsprogs socat linux escc syslinux syslinux/host ptpd ntp util-linux/ldattach uswitch pciutils bzip2'
 cfg_terminal='ttyS0'
 cfg_target_linux_kernel='arch/x86/boot/bzImage'
 cfg_ptpd_master='true'
@@ -13,3 +13,4 @@ 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='/etc/escc/hg1700.sh'
+cfg_kernel_extra_args='panic=-1'

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

@@ -0,0 +1,6 @@
+cfg_hostname='lauv-dolphin-2'
+cfg_eth_ext_ip='10.0.10.140'
+cfg_packages="$cfg_packages"
+cfg_escc_script='/etc/escc/ifog-imu-1-a.sh'
+cfg_escc_et='true'
+cfg_dune_i18n='C'

systems/lctr-a6xx/lauv-dolphin-3.cfg

@@ -0,0 +1,6 @@
+cfg_hostname='lauv-dolphin-3'
+cfg_eth_ext_ip='10.0.10.150'
+cfg_packages="$cfg_packages"
+cfg_escc_script='/etc/escc/ifog-imu-1-a.sh'
+cfg_escc_et='true'
+cfg_dune_i18n='C'

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

@@ -1,2 +1,3 @@
 cfg_hostname='lauv-lupis-1'
 cfg_eth_ext_ip='10.0.10.130'
+cfg_packages='zlib dropbear rsync busybox flashrom e2fsprogs socat linux escc syslinux syslinux/host ptpd uswitch pciutils bzip2'

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

@@ -1,3 +1,3 @@
 cfg_hostname='lauv-noptilus-2'
 cfg_eth_ext_ip='10.0.10.90'
-cfg_arp_table=''
+cfg_escc_script='/etc/escc/hg1700-psimar.sh'

systems/lctr-a6xx/lauv-noptilus-3.cfg

@@ -1,3 +1,3 @@
 cfg_hostname='lauv-noptilus-3'
 cfg_eth_ext_ip='10.0.10.100'
-cfg_arp_table='192.168.0.5|02:49:58:00:03:2a'
+cfg_escc_script='/etc/escc/hg1700-psimar.sh'

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

@@ -0,0 +1,3 @@
+cfg_hostname='lauv-oceaneco-1'
+cfg_eth_ext_ip='10.0.10.160'
+cfg_dune_i18n='C'

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

@@ -0,0 +1,3 @@
+cfg_hostname='lauv-oceaneco-2'
+cfg_eth_ext_ip='10.0.10.170'
+cfg_dune_i18n='C'

systems/lctr-a9xx/manta-12.cfg

@@ -0,0 +1,2 @@
+cfg_hostname='manta-12'
+cfg_eth_ext_ip='10.0.30.12'

systems/lctr-a9xx/manta-13.cfg

@@ -0,0 +1,2 @@
+cfg_hostname='manta-13'
+cfg_eth_ext_ip='10.0.30.13'

systems/lctr-a9xx/manta-14.cfg

@@ -0,0 +1,2 @@
+cfg_hostname='manta-14'
+cfg_eth_ext_ip='10.0.30.14'

systems/lctr-a9xx/manta-15.cfg

@@ -0,0 +1,2 @@
+cfg_hostname='manta-15'
+cfg_eth_ext_ip='10.0.30.15'

systems/lctr-a9xx/manta-16.cfg

@@ -0,0 +1,2 @@
+cfg_hostname='manta-16'
+cfg_eth_ext_ip='10.0.30.16'

systems/lctr-a9xx/manta-17.cfg

@@ -0,0 +1,2 @@
+cfg_hostname='manta-17'
+cfg_eth_ext_ip='10.0.30.17'

systems/lctr-a9xx/x8-03.cfg

@@ -0,0 +1,3 @@
+cfg_hostname='x8-03'
+cfg_eth_ext_ip='10.0.20.110'
+cfg_services1='ntpd'

systems/lctr-b2xx/x8-03.cfg

@@ -1,7 +0,0 @@
-cfg_hostname='x8-03'
-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_ptpd_interface='eth0'
-cfg_packages='dropbear rsync busybox e2fsprogs ptpd i2c-tools linux/am335x-evm ntp'