Marking version 1.9.5.

Conflicts:
	mkconfig.bash
	systems/lctr-a6xx/lauv-dolphin-1.cfg

.gitignore

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

README.md

@@ -18,10 +18,10 @@ terminal:
 ./mkconfig.bash list
 
 Once you have identified the name of the system you want to build,
-issue the following command, replacing <system_name> with the name of
+issue the following command, replacing \<system_name> with the name of
 that system:
 
-./mkconfig.bash <system_name>
+./mkconfig.bash \<system_name>
 
 Building
 ========
@@ -31,7 +31,7 @@ necessary packages.
 
 To start the compilation process, issue the following command:
 
-./mksystem.bash <config_file>
+./mksystem.bash \<config_file>
 
 Archives
 ========
@@ -46,7 +46,7 @@ To create a package containing all the necessary tools to
 cross-compile C/C++ programs for you target system, issue the
 following command:
 
-./pktoolchain.bash <config_file>
+./pktoolchain.bash \<config_file>
 
 Root Filesystem Archive
 -----------------------
@@ -56,7 +56,7 @@ GLUED system. It allows you to upgrade existing GLUED systems and
 initialize storage devices. To create a root filesystem archive, issue
 the following command:
 
-./pkrootfs.bash <config_file>
+./pkrootfs.bash \<config_file>
 
 Initializing Storage Devices
 ============================
@@ -72,7 +72,7 @@ To perform all of the previous steps, you must first identify the
 target block device file and then issue the following command (as
 root):
 
-./mkdisk.bash <config_file> <block_device>
+./mkdisk.bash \<config_file> \<block_device>
 
 Example
 =======

functions.bash

@@ -1,3 +1,24 @@
+###########################################################################
+# GLUED: GNU/Linux Uniform Environment Distribution                       #
+# Copyright (C) 2007-2013 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    #
+# it under the terms of the GNU General Public License as published by    #
+# the Free Software Foundation; either version 2 of the License, or (at   #
+# your option) any later version.                                         #
+#                                                                         #
+# This program is distributed in the hope that it will be useful, but     #
+# WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       #
+# General Public License for more details.                                #
+#                                                                         #
+# You should have received a copy of the GNU General Public License       #
+# along with this program; if not, write to the Free Software             #
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA           #
+# 02110-1301 USA.                                                         #
+###########################################################################
+
 nfo1()
 {
     echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] \033[0m\033[1;34m* $*\033[0m"

mkconfig.bash

@@ -1,16 +1,27 @@
 #! /bin/bash
-#############################################################################
-# Copyright (C) 2007-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                                                   #
-#############################################################################
-# $Id:: mkconfig.bash 1629 2013-06-30 11:39:30Z rasm                      $:#
-#############################################################################
+###########################################################################
+# GLUED: GNU/Linux Uniform Environment Distribution                       #
+# Copyright (C) 2007-2013 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    #
+# it under the terms of the GNU General Public License as published by    #
+# the Free Software Foundation; either version 2 of the License, or (at   #
+# your option) any later version.                                         #
+#                                                                         #
+# This program is distributed in the hope that it will be useful, but     #
+# WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       #
+# General Public License for more details.                                #
+#                                                                         #
+# You should have received a copy of the GNU General Public License       #
+# along with this program; if not, write to the Free Software             #
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA           #
+# 02110-1301 USA.                                                         #
+###########################################################################
 
 # Config: GLUED version.
-cfg_glued_version='1.8.3'
+cfg_glued_version='1.9.5'
 # Config: GLUED vendor.
 cfg_glued_vendor='lsts'
 

mkdisk.bash

@@ -1,13 +1,24 @@
 #! /bin/bash
-#############################################################################
-# Copyright (C) 2007-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                                                   #
-#############################################################################
-# $Id::                                                                   $:#
-#############################################################################
+###########################################################################
+# GLUED: GNU/Linux Uniform Environment Distribution                       #
+# Copyright (C) 2007-2013 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    #
+# it under the terms of the GNU General Public License as published by    #
+# the Free Software Foundation; either version 2 of the License, or (at   #
+# your option) any later version.                                         #
+#                                                                         #
+# This program is distributed in the hope that it will be useful, but     #
+# WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       #
+# General Public License for more details.                                #
+#                                                                         #
+# You should have received a copy of the GNU General Public License       #
+# along with this program; if not, write to the Free Software             #
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA           #
+# 02110-1301 USA.                                                         #
+###########################################################################
 
 cmd_parted()
 {

mkpackage.bash

@@ -1,13 +1,24 @@
 #! /bin/bash
-#############################################################################
-# Copyright (C) 2007-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                                                   #
-#############################################################################
-# $Id:: mkpackage.bash 1408 2013-02-06 14:10:34Z nurc                     $:#
-#############################################################################
+###########################################################################
+# GLUED: GNU/Linux Uniform Environment Distribution                       #
+# Copyright (C) 2007-2013 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    #
+# it under the terms of the GNU General Public License as published by    #
+# the Free Software Foundation; either version 2 of the License, or (at   #
+# your option) any later version.                                         #
+#                                                                         #
+# This program is distributed in the hope that it will be useful, but     #
+# WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       #
+# General Public License for more details.                                #
+#                                                                         #
+# You should have received a copy of the GNU General Public License       #
+# along with this program; if not, write to the Free Software             #
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA           #
+# 02110-1301 USA.                                                         #
+###########################################################################
 
 source "functions.bash"
 
@@ -80,6 +91,21 @@ download()
         let n++
     done
 
+    n=0; while [ -n "${git[$n]}" ]; do
+        u="$(echo ${git[$n]} | cut -f1 -d'#')"
+        b="$(echo ${git[$n]} | cut -f2 -d'#')"
+        dir=$(basename $u)
+        des="${cfg_dir_builds}/$PKG/$dir-git"
+
+        if [[ "$u" == git* ]]; then
+            git clone --verbose --branch "$b" "$u" "$des"
+        else
+            git clone --verbose               "$u" "$des"
+        fi
+
+        let n++
+    done
+
     return 0
 }
 
@@ -319,7 +345,7 @@ n=0; while [ -n "${requires[$n]}" ]; do
 
     "$0" "$1" "$req"
     if [ $? -ne 0 ]; then
-        err "failed to build dependecy for package $PKG / $PKG_VAR"
+        err "failed to build dependency for package $PKG / $PKG_VAR"
         exit 1
     fi
 done

mksystem.bash

@@ -1,13 +1,24 @@
 #! /bin/bash
-#############################################################################
-# Copyright (C) 2007-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                                                   #
-#############################################################################
-# $Id:: mksystem.bash 1152 2012-09-14 02:06:10Z rasm                      $:#
-#############################################################################
+###########################################################################
+# GLUED: GNU/Linux Uniform Environment Distribution                       #
+# Copyright (C) 2007-2013 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    #
+# it under the terms of the GNU General Public License as published by    #
+# the Free Software Foundation; either version 2 of the License, or (at   #
+# your option) any later version.                                         #
+#                                                                         #
+# This program is distributed in the hope that it will be useful, but     #
+# WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       #
+# General Public License for more details.                                #
+#                                                                         #
+# You should have received a copy of the GNU General Public License       #
+# along with this program; if not, write to the Free Software             #
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA           #
+# 02110-1301 USA.                                                         #
+###########################################################################
 
 # Check shell type.
 if [ -z "$BASH_VERSION" ]; then

packages/apache-ant/host.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '1.9.2'
+    '1.9.3'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    '20c6dc8e57d5dc8af595ec4faefd515c'
+    '6e6d888140858f3926c34081c4bd2227'
 )
 
 maintainer=\

packages/dei80211mr/default.bash

@@ -1,104 +0,0 @@
-version=\
-(
-    '1.1.4'
-)
-
-ns_version=\
-(
-    '2.34'
-)
-
-url=\
-(
-    "http://www.lsts.pt/glued/dei80211mr-$version.tar.gz"
-)
-
-md5=\
-(
-    '8ad1adcd02fc41933d6528c093e1c3d9'
-)
-
-requires=\
-(
-    'ns/default'
-)
-
-post_unpack()
-{
-    patches=$(ls "$cfg_package_spec_dir/patches/"*.patch)
-    if [ -n "$patches" ]; then
-        cat $patches | patch -p0
-    fi
-}
-
-configure()
-{
-    prefix="/ns2_lib"
-
-cd ../dei80211mr-$version/
-
-make distclean
-rm -fr autom4te.cache/
-rm config.*
-rm missing
-rm Makefile.in
-rm install-sh
-rm depcomp
-rm configure
-rm ltmain.sh
-rm m4/libtool*
-rm m4/Makefile
-rm m4/Makefile.in
-rm aclocal.m4
-rm m4/lt*
-
-find . -name "*.o" -exec rm {} \;
-
-cd -
-
-/usr/bin/aclocal -I m4 --force && /usr/bin/libtoolize --force && /usr/bin/automake --foreign --add-missing && /usr/bin/autoconf
-
-    sed "s#@TCL2CPP@#qemu-arm -L ${cfg_dir_rootfs} ${cfg_dir_rootfs}/lib/ld-linux.so.3 ${cfg_dir_toolchain_sysroot}/usr/bin/tcl2c++#g" "./m4/Makefile.in" -i
-
-    sed "s#@TCL2CPP@#qemu-arm -L ${cfg_dir_rootfs} ${cfg_dir_rootfs}/lib/ld-linux.so.3 ${cfg_dir_toolchain_sysroot}/usr/bin/tcl2c++#g" "./Makefile.in" -i
-
-    sed "s#@TCL2CPP@#qemu-arm -L ${cfg_dir_rootfs} ${cfg_dir_rootfs}/lib/ld-linux.so.3 ${cfg_dir_toolchain_sysroot}/usr/bin/tcl2c++#g" "./src/Makefile.in" -i
-
-    "../dei80211mr-$version/configure" \
-        --target="$cfg_target_canonical" \
-        --host="$cfg_target_canonical" \
-        --build="$cfg_host_canonical" \
-        --prefix="$prefix" \
-	--disable-static \
-	--enable-shared \
-	--with-ns-allinone=${cfg_dir_builds}/ns/ \
-	--x-includes=no --x-libraries=no
-}
-
-build()
-{
-
-    $cmd_make -j1
-}
-
-host_install()
-{
-    $cmd_mkdir \
-        "$cfg_dir_toolchain_sysroot/ns2/ns2_lib/lib" \
-        "$cfg_dir_toolchain_sysroot/ns2/ns2_lib/share" &&
-
-    $cmd_make \
-        DESTDIR="$cfg_dir_toolchain_sysroot/ns2" \
-        install
-
-}
-
-target_install()
-{
-    $cmd_mkdir \
-	"${cfg_dir_rootfs}/usr/ns2/lib/"
-
-    for f in "$cfg_dir_toolchain_sysroot/ns2/ns2_lib/lib/"lib*.so*; do
-        $cmd_target_strip "$f" -o ${cfg_dir_rootfs}/usr/ns2/lib/"$(basename "$f")"
-    done
-}

packages/dei80211mr/patches/000-lib.patch

@@ -1,19 +0,0 @@
---- m4/nsallinone.m4	2012-09-21 14:09:26.000000000 +0200
-+++ m4/nsallinone.m4	2012-09-21 17:08:21.807075643 +0200
-@@ -49,12 +49,10 @@
- 		NS_ALLINONE_PATH=$withval
- 
- 		NS_PATH=$NS_ALLINONE_PATH/`cd $NS_ALLINONE_PATH; ls -d ns-* | head -n 1`
--		TCL_PATH=$NS_ALLINONE_PATH/`cd $NS_ALLINONE_PATH; ls -d * | grep -e 'tcl[0-9].*' | head -n 1`
--		TCLCL_PATH=$NS_ALLINONE_PATH/`cd $NS_ALLINONE_PATH; ls -d tclcl-* | head -n 1`
--		OTCL_PATH=$NS_ALLINONE_PATH/`cd $NS_ALLINONE_PATH; ls -d otcl-* | head -n 1`
--
--		NS_CPPFLAGS="-I$NS_ALLINONE_PATH/include -I$NS_PATH -I$TCLCL_PATH -I$OTCL_PATH"
--
-+		TCL_PATH="${cfg_dir_builds}/tcl/"`cd "${cfg_dir_builds}/tcl/"; ls -d * | grep -e 'tcl[0-9].*' | head -n 1`
-+		TCLCL_PATH="${cfg_dir_builds}/tclcl/"`cd "${cfg_dir_builds}/tclcl"; ls -d tclcl-* | head -n 1`
-+		OTCL_PATH="${cfg_dir_builds}/otcl/"`cd "${cfg_dir_builds}/otcl/"; ls -d otcl-* | head -n 1`
-+		NS_CPPFLAGS="${cfg_dir_toolchain_sysroot}/usr/include -I$NS_PATH -I$TCLCL_PATH -I$OTCL_PATH"
- 
- 		NS_ALLINONE_DISTCHECK_CONFIGURE_FLAGS="--with-ns-allinone=$withval"
- 		AC_SUBST(NS_ALLINONE_DISTCHECK_CONFIGURE_FLAGS)

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

@@ -0,0 +1,9 @@
+# IMU
+/usr/bin/setescc 0 0x200 5 0 0 0
+/usr/bin/esccclock 0 0x5d1460 23
+/usr/bin/esccsettings 0 /etc/escc/hg1700.cfg
+
+# PSIMAR
+/usr/bin/setescc 1 0x200 5 0 0 1
+/usr/bin/esccsettings 1 /etc/escc/psimar.cfg
+/usr/bin/esccclock 1 0xc8920 22

packages/filesystem/fs/etc/rc.d/bbb-mux

@@ -6,5 +6,8 @@ start()
     echo 0 > /sys/kernel/debug/omap_mux/uart1_txd &&
     echo 20 > /sys/kernel/debug/omap_mux/uart1_rxd &&
 
+    # Camera/Strobe
+    echo 0x07 > /sys/kernel/debug/omap_mux/lcd_data6 &&
+
     umount /sys/kernel/debug
 }

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

@@ -14,6 +14,7 @@ maybe_upgrade()
     rm -rf $dune_base/.dune-upgrade &&
     mkdir $dune_base/.dune-upgrade &&
     tar -x -C $dune_base/.dune-upgrade -f $dune_base/dune-*.tar.bz2 &&
+    cp "$dune_base/etc/"*-saved.ini "$dune_base/.dune-upgrade/"dune-*/etc 2> /dev/null &&
     rm $dune_base/dune-*.tar.bz2 &&
     for dir in $dune_base/.dune-upgrade/dune-*/*; do
         d="$(basename "$dir")"

packages/flashrom/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    "0.9.5.2"
+    '0.9.5.2'
 )
 
 url=\
@@ -10,12 +10,17 @@ url=\
 
 md5=\
 (
-    "280f8b1d3ef0533d6ec913b0da857477"
+    '280f8b1d3ef0533d6ec913b0da857477'
 )
 
 maintainer=\
 (
-    "Renato Caldas <rmsc@fe.up.pt>"
+    'Renato Caldas <rmsc@fe.up.pt>'
+)
+
+requires=\
+(
+    'pciutils/default'
 )
 
 build()

packages/gettext/host.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '0.18.1.1'
+    '0.18.3.1'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    '3dd55b952826d2b32f51308f2f91aa89'
+    '3fc808f7d25487fc72b5759df7419e02'
 )
 
 maintainer=\

packages/libpng/default.bash

@@ -1,46 +1,45 @@
 version=\
 (
-  "1.6.2"
+    '1.6.8'
 )
 
 url=\
 (
-  "http://downloads.sourceforge.net/project/libpng/libpng16/$version/libpng-$version.tar.xz"
+    "http://downloads.sourceforge.net/project/libpng/libpng16/$version/libpng-$version.tar.xz"
 )
 
 md5=\
 (
-  "9d838f6fca9948a9f360a0cc1b516d5f"
+    '51ce71a1642cdde1f4485a7ff82193c0'
 )
 
 configure()
 {
-  ./configure \
-    --prefix="${cfg_dir_toolchain_sysroot}/usr" \
-    --target="$cfg_target_canonical"            \
-    --host="$cfg_target_canonical"              \
-    --build="$cfg_host_canonical"
+    ./configure \
+        --prefix="${cfg_dir_toolchain_sysroot}/usr" \
+        --target="$cfg_target_canonical"            \
+        --host="$cfg_target_canonical"              \
+        --build="$cfg_host_canonical"
 }
 
 build()
 {
-  $cmd_make
+    $cmd_make
 }
 
 host_install()
 {
-  $cmd_make install
+    $cmd_make install
 }
 
 target_install()
 {
-  # Libs: 
-  for f in "$cfg_dir_toolchain_sysroot/usr/lib/"libpng*.so*; do
-    if [ -L "$f" ]; then
-      $cmd_cp "$f" "$cfg_dir_rootfs/usr/lib"
-    else
-      $cmd_target_strip -v "$f" -o "$cfg_dir_rootfs/usr/lib/$(basename "$f")"
-    fi
-  done
+    # Libs:
+    for f in "$cfg_dir_toolchain_sysroot/usr/lib/"libpng*.so*; do
+        if [ -L "$f" ]; then
+            $cmd_cp "$f" "$cfg_dir_rootfs/usr/lib"
+        else
+            $cmd_target_strip -v "$f" -o "$cfg_dir_rootfs/usr/lib/$(basename "$f")"
+        fi
+    done
 }
-

packages/nodejs/default.bash

@@ -0,0 +1,38 @@
+version=\
+(
+    '0.10.18'
+)
+
+url=\
+(
+    "http://nodejs.org/dist/v$version/node-v$version.tar.gz"
+)
+
+md5=\
+(
+    '8b905b6013b82fb7076b02a6c881f9a6'
+)
+
+maintainer=\
+(
+    'Jose Pinto <zepinto@fe.up.pt>'
+)
+
+configure()
+{
+    "../node-v$version/configure" --without-snapshot --prefix="${cfg_dir_rootfs}"
+}
+
+build()
+{
+    cd "../node-v$version"
+    $cmd_make
+}
+
+target_install()
+{
+    cd "../node-v$version"
+    $cmd_make install
+}
+
+

packages/ns-miracle/default.bash

@@ -1,106 +0,0 @@
-version=\
-(
-    '1.0'
-)
-
-dei_version=\
-(
-    '1.1.4'
-)
-
-ns_version=\
-(
-    '2.34'
-)
-
-url=\
-(
-    "http://www.lsts.pt/glued/ns-miracle-$version.tar.gz"
-)
-
-md5=\
-(
-    '860072ac58b2d1274da46d02b5608229'
-)
-
-requires=\
-(
-    'ns/default'
-    'dei80211mr/default'
-)
-
-post_unpack()
-{
-    patches=$(ls "$cfg_package_spec_dir/patches/"*.patch)
-    if [ -n "$patches" ]; then
-        cat $patches | patch -p0
-    fi
-}
-
-configure()
-{
-	cd ../ns-miracle-$version/trunk/main/
-    prefix="/ns2_lib"
-make distclean
-rm -fr autom4te.cache/
-rm config.*
-rm missing
-rm Makefile.in
-rm install-sh
-rm depcomp
-rm configure
-rm ltmain.sh
-rm m4/libtool*
-rm m4/Makefile
-rm m4/Makefile.in
-rm aclocal.m4
-rm m4/lt*
-
-find . -name "*.o" -exec rm {} \;
-/usr/bin/aclocal -I m4 --force && /usr/bin/libtoolize --force && /usr/bin/automake --foreign --add-missing && /usr/bin/autoconf
-
-    sed "s#@TCL2CPP@#qemu-arm -L ${cfg_dir_rootfs} ${cfg_dir_rootfs}/lib/ld-linux.so.3 ${cfg_dir_toolchain_sysroot}/usr/bin/tcl2c++#g" "./m4/Makefile.in" -i
-
-    sed "s#@TCL2CPP@#qemu-arm -L ${cfg_dir_rootfs} ${cfg_dir_rootfs}/lib/ld-linux.so.3 ${cfg_dir_toolchain_sysroot}/usr/bin/tcl2c++#g" "./Makefile.in" -i
-
-
-    "./configure" \
-        --target="$cfg_target_canonical" \
-        --host="$cfg_target_canonical" \
-        --build="$cfg_host_canonical" \
-        --prefix="$prefix" \
-	--disable-static \
-	--enable-shared \
-	--with-ns-allinone=${cfg_dir_builds}/ns/ \
-	--with-dei80211mr=${cfg_dir_builds}/dei80211mr/dei80211mr-$dei_version
-}
-
-build()
-{
-	cd ../ns-miracle-$version/trunk/main/
-
-    $cmd_make -j1 \
-       TCL2CPP="qemu-arm -L ${cfg_dir_rootfs} ${cfg_dir_rootfs}/lib/ld-linux.so.3 ${cfg_dir_toolchain_sysroot}/usr/bin/tcl2c++"
-}
-
-host_install()
-{
-	cd ../ns-miracle-$version/trunk/main/
-    $cmd_mkdir \
-        "$cfg_dir_toolchain_sysroot/ns2/ns2_lib/lib" \
-        "$cfg_dir_toolchain_sysroot/ns2/ns2_lib/share" &&
-
-    $cmd_make \
-        DESTDIR="$cfg_dir_toolchain_sysroot/ns2" \
-        install
-
-}
-
-target_install()
-{
-    $cmd_mkdir \
-	"${cfg_dir_rootfs}/usr/ns2/lib/"
-     for f in "$cfg_dir_toolchain_sysroot/ns2/ns2_lib/lib/"lib*.so*; do
-        $cmd_target_strip "$f" -o ${cfg_dir_rootfs}/usr/ns2/lib/"$(basename "$f")"
-    done
-}

packages/ns-miracle/patches/000-lib.patch

@@ -1,19 +0,0 @@
---- trunk/main/m4/nsallinone.m4	2012-09-21 14:09:26.000000000 +0200
-+++ trunk/main/m4/nsallinone.m4	2012-09-21 17:08:21.807075643 +0200
-@@ -49,12 +49,10 @@
- 		NS_ALLINONE_PATH=$withval
- 
- 		NS_PATH=$NS_ALLINONE_PATH/`cd $NS_ALLINONE_PATH; ls -d ns-* | head -n 1`
--		TCL_PATH=$NS_ALLINONE_PATH/`cd $NS_ALLINONE_PATH; ls -d * | grep -e 'tcl[0-9].*' | head -n 1`
--		TCLCL_PATH=$NS_ALLINONE_PATH/`cd $NS_ALLINONE_PATH; ls -d tclcl-* | head -n 1`
--		OTCL_PATH=$NS_ALLINONE_PATH/`cd $NS_ALLINONE_PATH; ls -d otcl-* | head -n 1`
--
--		NS_CPPFLAGS="-I$NS_ALLINONE_PATH/include -I$NS_PATH -I$TCLCL_PATH -I$OTCL_PATH"
--
-+		TCL_PATH="${cfg_dir_builds}/tcl/"`cd "${cfg_dir_builds}/tcl/"; ls -d * | grep -e 'tcl[0-9].*' | head -n 1`
-+		TCLCL_PATH="${cfg_dir_builds}/tclcl/"`cd "${cfg_dir_builds}/tclcl"; ls -d tclcl-* | head -n 1`
-+		OTCL_PATH="${cfg_dir_builds}/otcl/"`cd "${cfg_dir_builds}/otcl/"; ls -d otcl-* | head -n 1`
-+		NS_CPPFLAGS="${cfg_dir_toolchain_sysroot}/usr/include -I$NS_PATH -I$TCLCL_PATH -I$OTCL_PATH"
- 
- 		NS_ALLINONE_DISTCHECK_CONFIGURE_FLAGS="--with-ns-allinone=$withval"
- 		AC_SUBST(NS_ALLINONE_DISTCHECK_CONFIGURE_FLAGS)

packages/ns-miracle/patches/001-lib.patch

@@ -1,11 +0,0 @@
---- trunk/main/configure.ac	2012-09-26 14:56:59.532858970 +0200
-+++ trunk/main/configure.ac	2012-09-26 14:55:04.897973134 +0200
-@@ -70,7 +70,7 @@
- 
- dnl Activate all compile warnings & debug symbols
- CFLAGS="${CFLAGS=} -Wall -g"
--
-+TCL2CPP="qemu-arm -L ${cfg_dir_rootfs} ${cfg_dir_rootfs}/lib/ld-linux.so.3 ${cfg_dir_toolchain_sysroot}/usr/bin/tcl2c++"
- 
- AC_DEFINE(CPP_NAMESPACE,std)
- 

packages/rsync/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    "3.0.9"
+    '3.1.0'
 )
 
 url=\
@@ -10,12 +10,12 @@ url=\
 
 md5=\
 (
-    "5ee72266fe2c1822333c407e1761b92b"
+    '3be148772a33224771a8d4d2a028b132'
 )
 
 maintainer=\
 (
-    "Ricardo Martins <rasm@fe.up.pt>"
+    'Ricardo Martins <rasm@fe.up.pt>'
 )
 
 requires=\

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

@@ -952,8 +952,8 @@ CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_FIX_EARLYCON_MEM=y
 # CONFIG_SERIAL_8250_PCI is not set
-CONFIG_SERIAL_8250_NR_UARTS=16
-CONFIG_SERIAL_8250_RUNTIME_UARTS=16
+CONFIG_SERIAL_8250_NR_UARTS=24
+CONFIG_SERIAL_8250_RUNTIME_UARTS=24
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 # CONFIG_SERIAL_8250_FOURPORT is not set

systems/lctr-a6xx/config

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

systems/lctr-a6xx/fs/etc/mdev.conf

@@ -9,3 +9,11 @@ ttyS8	root:root	660	>uart/9
 ttyS9	root:root	660	>uart/10
 ttyS10	root:root	660	>uart/11
 ttyS11	root:root	660	>uart/12
+ttyS12	root:root	660	>uart/13
+ttyS13	root:root	660	>uart/14
+ttyS14	root:root	660	>uart/15
+ttyS15	root:root	660	>uart/16
+ttyS16	root:root	660	>uart/17
+ttyS17	root:root	660	>uart/18
+ttyS18	root:root	660	>uart/19
+ttyS19	root:root	660	>uart/20

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

@@ -2,5 +2,4 @@ cfg_hostname='lauv-dolphin-1'
 cfg_eth_ext_ip='10.0.10.80'
 cfg_packages="$cfg_packages"
 cfg_escc_script='/etc/escc/ifog-imu-1-a.sh'
-cfg_arp_table='192.168.0.5|00:1F:F2:06:E3:61'
-cfg_dune_i18n='ru_RU'
+cfg_dune_i18n='C'

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

@@ -0,0 +1,2 @@
+cfg_hostname='lauv-lsts-1'
+cfg_eth_ext_ip='10.0.10.110'

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=''
+cfg_arp_table='192.168.0.5|02:49:58:00:03:2a'

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

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

systems/lctr-a6xx/lauv-seacon-4.cfg

@@ -1,2 +0,0 @@
-cfg_hostname='lauv-seacon-4'
-cfg_eth_ext_ip='10.0.10.40'

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

@@ -0,0 +1,2 @@
+cfg_hostname='lauv-xplore-1'
+cfg_eth_ext_ip='10.0.10.120'

systems/lctr-a6xx/patches/linux/patches-3.5.4/200-aim104-com8.patch

@@ -1,7 +1,7 @@
 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,43 @@
+@@ -0,0 +1,51 @@
 +#include <linux/module.h>
 +#include <linux/init.h>
 +#include <linux/serial_8250.h>
@@ -24,6 +24,14 @@ diff -Nru a/drivers/tty/serial/8250/8250_aim104_com8.c b/drivers/tty/serial/8250
 +	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),
 +	{ },
 +};
 +

systems/lctr-a8xx/lauv-xtreme-2-trex.cfg

@@ -0,0 +1,5 @@
+cfg_packages='dropbear rsync busybox e2fsprogs libjpeg-turbo ptpd linux syslinux syslinux/host bzip2 libantlr3c boost europa'
+cfg_hostname='lauv-xtreme-2-doam'
+cfg_eth_ext_ip='10.0.10.52'
+cfg_kernel_boot_dev='/dev/sda1'
+cfg_services2='dune trex'

systems/lctr-a9xx/config

@@ -4,7 +4,7 @@ cfg_modules=''
 cfg_services0='dropbear network storage upgrade syslog'
 cfg_services1='huawei ntpd'
 cfg_services2='dune'
-cfg_packages='u-boot dropbear rsync busybox linux uswitch ppp iptables socat bridge-utils ntp e2fsprogs dtn i2c-tools iperf dnsmasq'
+cfg_packages='u-boot dropbear rsync busybox linux uswitch ppp iptables socat bridge-utils ntp e2fsprogs i2c-tools iperf dnsmasq'
 cfg_target_linux_kernel='arch/arm/boot/uImage'
 cfg_terminal='ttyO2'
 cfg_ntpd_config='/etc/ntp/server.cfg'

systems/lctr-b2xx/lauv-seacon-1-aux.cfg

@@ -0,0 +1,7 @@
+cfg_hostname='lauv-seacon-1-aux'
+cfg_storage='data0:ext4:/opt'
+cfg_eth_ext_ip='10.0.10.13'
+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 linux/am335x-evm'

systems/lctr-b2xx/x8-03.cfg

@@ -0,0 +1,7 @@
+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'

utils/glued-download-sources.bash

@@ -1,13 +1,24 @@
 #! /bin/bash
-#############################################################################
-# Copyright (C) 2007-2013 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                                                   #
-#############################################################################
-# $Id:: glued-download-sources.bash 1622 2013-06-25 08:31:22Z rasm        $:#
-#############################################################################
+###########################################################################
+# GLUED: GNU/Linux Uniform Environment Distribution                       #
+# Copyright (C) 2007-2013 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    #
+# it under the terms of the GNU General Public License as published by    #
+# the Free Software Foundation; either version 2 of the License, or (at   #
+# your option) any later version.                                         #
+#                                                                         #
+# This program is distributed in the hope that it will be useful, but     #
+# WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       #
+# General Public License for more details.                                #
+#                                                                         #
+# You should have received a copy of the GNU General Public License       #
+# along with this program; if not, write to the Free Software             #
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA           #
+# 02110-1301 USA.                                                         #
+###########################################################################
 
 if [ -f 'functions.bash' ]; then
     DST='downloads'