Bumped version to 1.9.14.

functions.bash

@@ -1,6 +1,6 @@
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2014 Universidade do Porto - Faculdade de Engenharia #
+# 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    #
@@ -18,8 +18,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA           #
 # 02110-1301 USA.                                                         #
 ###########################################################################
-# Author: Ricardo Martins                                                 #
-###########################################################################
 
 nfo1()
 {

mkbackup.bash

@@ -27,7 +27,7 @@ tar czf "$1/${backupsystem}_backup/${backupfile}" \
   architectures \
   scripts \
   product \
-  rules \
+  packages \
   systems
 
 echo "Done ... "

mkconfig.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2014 Universidade do Porto - Faculdade de Engenharia #
+# 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    #
@@ -19,11 +19,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA           #
 # 02110-1301 USA.                                                         #
 ###########################################################################
-# Author: Ricardo Martins                                                 #
-###########################################################################
 
 # Config: GLUED version.
-cfg_glued_version='1.11.1'
+cfg_glued_version='1.9.14'
 # Config: GLUED vendor.
 cfg_glued_vendor='lsts'
 
@@ -112,7 +110,7 @@ cfg_dir_base="$PWD"
 # Config: system configuration folder.
 cfg_dir_system="$cfg_dir_base/$family_dir"
 # Config: package rules folder.
-cfg_dir_rules="$cfg_dir_base/rules"
+cfg_dir_packages="$cfg_dir_base/packages"
 # Config: configuration rules folder.
 cfg_dir_postconfiguration="$cfg_dir_base/postconfiguration"
 # Config: package sources folder.

mkdisk.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2014 Universidade do Porto - Faculdade de Engenharia #
+# 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    #
@@ -19,8 +19,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA           #
 # 02110-1301 USA.                                                         #
 ###########################################################################
-# Author: Ricardo Martins                                                 #
-###########################################################################
 
 cmd_parted()
 {

mkpackage.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2014 Universidade do Porto - Faculdade de Engenharia #
+# 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    #
@@ -19,8 +19,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA           #
 # 02110-1301 USA.                                                         #
 ###########################################################################
-# Author: Ricardo Martins                                                 #
-###########################################################################
 
 source "functions.bash"
 
@@ -97,7 +95,7 @@ download()
         u="$(echo ${git[$n]} | cut -f1 -d'#')"
         b="$(echo ${git[$n]} | cut -f2 -d'#')"
         dir=$(basename $u)
-        des="${cfg_dir_builds}/$pkg/$dir-git"
+        des="${cfg_dir_builds}/$PKG/$dir-git"
 
         if [[ "$u" == git* ]]; then
             git clone --verbose --branch "$b" "$u" "$des"
@@ -125,10 +123,10 @@ unpack()
 
         case $file in
             *tar*|*tgz|*tbz*)
-                tar -C "$cfg_dir_builds/$pkg" -x -f "$cfg_dir_downloads/$file" || exit 1
+                tar -C "$cfg_dir_builds/$PKG" -x -f "$cfg_dir_downloads/$file" || exit 1
                 ;;
             *zip)
-                unzip "$cfg_dir_downloads/$file" -d "$cfg_dir_builds/$pkg" || exit 1
+                unzip "$cfg_dir_downloads/$file" -d "$cfg_dir_builds/$PKG" || exit 1
                 ;;
             *)
                 echo "File $file can't be handled."
@@ -139,11 +137,11 @@ unpack()
 
     dir_gnu_cfg="$cfg_dir_toolchain/share/gnu-config"
     if [ "$cfg_dir_cfg/config.sub" ]; then
-        find "$cfg_dir_builds/$pkg" -name config.sub -exec install -v -m 0755 "$dir_gnu_cfg/config.sub" '{}' \;
+        find "$cfg_dir_builds/$PKG" -name config.sub -exec install -v -m 0755 "$dir_gnu_cfg/config.sub" '{}' \;
     fi
 
     if [ "$cfg_dir_cfg/config.guess" ]; then
-        find "$cfg_dir_builds/$pkg" -name config.guess -exec install -v -m 0755 "$dir_gnu_cfg/config.guess" '{}' \;
+        find "$cfg_dir_builds/$PKG" -name config.guess -exec install -v -m 0755 "$dir_gnu_cfg/config.guess" '{}' \;
     fi
 
     return 0
@@ -181,48 +179,48 @@ postconfigure()
 
 perform_clean()
 {
-    rm -rf "$cfg_dir_builds/$pkg/$pkg_var"
+    rm -rf "$cfg_dir_builds/$PKG/$PKG_VAR"
 }
 
 perform_all()
 {
     start="$(date +%s)"
-    nfo1 "$pkg / $pkg_var"
+    nfo1 "$PKG / $PKG_VAR"
 
-    export pkg_build_dir="$cfg_dir_builds/$pkg/$pkg_var"
+    export pkg_build_dir="$cfg_dir_builds/$PKG/$PKG_VAR"
 
     for rule in download unpack post_unpack refresh configure build host_install target_install postconfigure; do
         case $rule in
             download | unpack | post_unpack)
-                marker="$cfg_dir_builds/$pkg/.$rule"
+                marker="$cfg_dir_builds/$PKG/.$rule"
                 ;;
             *)
-                marker="$cfg_dir_builds/$pkg/$pkg_var/.$rule"
+                marker="$cfg_dir_builds/$PKG/$PKG_VAR/.$rule"
                 ;;
         esac
 
-        mkdir -p "$cfg_dir_builds/$pkg/$pkg_var" && cd "$cfg_dir_builds/$pkg/$pkg_var"
+        mkdir -p "$cfg_dir_builds/$PKG/$PKG_VAR" && cd "$cfg_dir_builds/$PKG/$PKG_VAR"
 
         if [ -z "$build_dir" ]; then
-            build_dir="$pkg-$version"
+            build_dir="$PKG-$version"
         fi
 
         if [ -n "$build_dir" ]; then
-            mkdir -p "$cfg_dir_builds/$pkg/$build_dir" && cd "$cfg_dir_builds/$pkg/$build_dir"
+            mkdir -p "$cfg_dir_builds/$PKG/$build_dir" && cd "$cfg_dir_builds/$PKG/$build_dir"
         fi
 
         if [ -n "$build_always" ] || [ "$rule" = 'refresh' ]; then
             nfo2 "$rule"
-            $rule > "$cfg_dir_builds/$pkg/$pkg_var/$rule.log" 2>&1
+            $rule > "$cfg_dir_builds/$PKG/$PKG_VAR/$rule.log" 2>&1
         else
             if ! [ -f "$marker" ]; then
                 nfo2 "$rule"
-                $rule > "$cfg_dir_builds/$pkg/$pkg_var/$rule.log" 2>&1
+                $rule > "$cfg_dir_builds/$PKG/$PKG_VAR/$rule.log" 2>&1
                 if [ $? -eq 0 ]; then
                     touch "$marker"
                 else
-                    err "failed to execute rule $rule of $pkg / $pkg_var"
-                    tail "$cfg_dir_builds/$pkg/$pkg_var/$rule.log"
+                    err "failed to execute rule $rule of $PKG / $PKG_VAR"
+                    tail "$cfg_dir_builds/$PKG/$PKG_VAR/$rule.log"
                     exit 1
                 fi
             fi
@@ -231,7 +229,7 @@ perform_all()
 
     elapsed=$[ $(date +%s)-$start ]
     ok "completed in ${elapsed}s"
-    touch "$cfg_dir_builds/$pkg/$pkg_var/.complete"
+    touch "$cfg_dir_builds/$PKG/$PKG_VAR/.complete"
 }
 
 # Check shell.
@@ -298,17 +296,17 @@ if [ "$pkg_var" = "$pkg" ]; then
     pkg_var='default'
 fi
 
-export pkg
-export pkg_var
-export pkg_common="$cfg_dir_rules/$pkg/common.bash"
+export PKG="$pkg"
+export PKG_VAR="$pkg_var"
+export PKG_COMMON="$cfg_dir_packages/$PKG/common.bash"
 
-if ! [ -d "$cfg_dir_rules/$pkg" ]; then
-    echo "ERROR: package '$pkg' does not exist."
+if ! [ -d "$cfg_dir_packages/$PKG" ]; then
+    echo "ERROR: package '$PKG' does not exist."
     exit 1
 fi
 
-if ! [ -f "$cfg_dir_rules/$pkg/$pkg_var.bash" ]; then
-    echo "ERROR: variant '$pkg_var' of package '$pkg' does not exist."
+if ! [ -f "$cfg_dir_packages/$PKG/$PKG_VAR.bash" ]; then
+    echo "ERROR: variant '$PKG_VAR' of package '$PKG' does not exist."
     exit 1
 fi
 
@@ -318,18 +316,18 @@ else
     rule="$3"
 fi
 
-mkdir -p "$cfg_dir_downloads" "$cfg_dir_rootfs" "$cfg_dir_toolchain" "$cfg_dir_builds/$pkg"
+mkdir -p "$cfg_dir_downloads" "$cfg_dir_rootfs" "$cfg_dir_toolchain" "$cfg_dir_builds/$PKG"
 
-export pkg_dir="$cfg_dir_rules/$pkg"
+export cfg_package_spec_dir="$cfg_dir_base/packages/$PKG"
 
-. "$cfg_dir_rules/$pkg/$pkg_var.bash"
+. "$cfg_dir_packages/$PKG/$PKG_VAR.bash"
 
 # Postconfiguration:
-if [ -e "$cfg_dir_postconfiguration/$pkg/$cfg_sys_name.bash" ]; then
-#    echo "ERROR: postconfiguration exists '$pkg'."
-#    echo "$cfg_dir_postconfiguration/$pkg/$cfg_sys_name.bash"
+if [ -e "$cfg_dir_postconfiguration/$PKG/$cfg_sys_name.bash" ]; then
+#    echo "ERROR: postconfiguration exists '$PKG'."
+#    echo "$cfg_dir_postconfiguration/$PKG/$cfg_sys_name.bash"
 #    exit 1
-. "$cfg_dir_postconfiguration/$pkg/$cfg_sys_name.bash"
+. "$cfg_dir_postconfiguration/$PKG/$cfg_sys_name.bash"
 fi
 
 # Handle dependencies.
@@ -347,7 +345,7 @@ n=0; while [ -n "${requires[$n]}" ]; do
 
     "$0" "$1" "$req"
     if [ $? -ne 0 ]; then
-        err "failed to build dependency for package $pkg / $pkg_var"
+        err "failed to build dependency for package $PKG / $PKG_VAR"
         exit 1
     fi
 done

mksystem.bash

@@ -19,8 +19,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA           #
 # 02110-1301 USA.                                                         #
 ###########################################################################
-# Author: Ricardo Martins                                                 #
-###########################################################################
 
 # Check shell type.
 if [ -z "$BASH_VERSION" ]; then

packages/apache-log4cxx/default.bash

@@ -21,7 +21,7 @@ requires=\
 
 post_unpack()
 {
-    patches=$(ls "$pkg_dir/patches-$version/"*.patch 2>/dev/null)
+    patches=$(ls "$cfg_package_spec_dir/patches-$version/"*.patch 2>/dev/null)
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
     fi

packages/base/cross.bash

@@ -1,4 +1,4 @@
-source $pkg_common
+source $PKG_COMMON
 
 requires=\
 (

packages/base/default.bash

@@ -1,4 +1,4 @@
-source $pkg_common
+source $PKG_COMMON
 
 requires=\
 (

packages/binutils/cross.bash

@@ -18,7 +18,7 @@ maintainer=\
     "Ricardo Martins <rasm@fe.up.pt>"
 )
 
-build_dir=$pkg_var
+build_dir=$PKG_VAR
 
 configure()
 {

packages/boost/default.bash

@@ -0,0 +1,93 @@
+version=\
+(
+    "1.53.0"
+)
+
+vendor_version="$(echo $version | tr . _)"
+
+url=\
+(
+    "http://downloads.sourceforge.net/project/boost/boost/$version/boost_$vendor_version.tar.bz2"
+)
+
+maintainer=\
+(
+    'Jose Pinto <zepinto@fe.up.pt>'
+)
+
+md5=\
+(
+    "a00d22605d5dbcfb4c9936a9b35bc4c2"
+)
+
+requires=\
+(
+    'bzip2/default'
+)
+
+post_unpack()
+{
+    patches=$(ls "$cfg_package_spec_dir/patches-${version}/"*.patch)
+    if [ -n "$patches" ]; then
+        cd "../boost_$vendor_version" &&  cat $patches | patch -p1
+    fi
+}
+
+configure()
+{
+    cd "../boost_$vendor_version" &&
+    ./bootstrap.sh \
+        --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
+    echo "" >> user-config.jam
+}
+
+build()
+{
+    cd "../boost_$vendor_version" &&
+    ./bjam -d+2 \
+	toolset=gcc \
+	variant=release \
+	link=shared \
+	threading=multi \
+	runtime-link=shared \
+        -sICU_PATH="$cfg_dir_toolchain_sysroot/usr" \
+	--user-config=user-config.jam \
+	--prefix="${cfg_dir_toolchain_sysroot}/usr" \
+	--without-python \
+	--layout=tagged
+}
+
+
+host_install()
+{
+    cd "../boost_$vendor_version" &&
+    ./bjam -d+2 \
+	toolset=gcc \
+	variant=release \
+	link=shared \
+	threading=multi \
+	runtime-link=shared \
+        -sICU_PATH="$cfg_dir_toolchain_sysroot/usr" \
+	--user-config=user-config.jam \
+	--prefix="${cfg_dir_toolchain_sysroot}/usr" \
+	--without-python \
+        --layout=tagged \
+        install
+
+    mkdir -p "${cfg_dir_toolchain_sysroot}/usr/share"
+    cp -rvd "../boost_$vendor_version/boost" \
+	"${cfg_dir_toolchain_sysroot}/usr/share"
+}
+
+target_install()
+{
+    base="$cfg_dir_toolchain_sysroot/usr/lib"
+    for f in "$base/libboost_"*.so*; do
+        dst="$cfg_dir_rootfs/lib/$(basename "$f")"
+        cp -v -d "$f" "$dst" &&
+        $cmd_target_strip "$dst"
+    done
+}

packages/bridge-utils/default.bash

@@ -1,31 +1,26 @@
 version=\
 (
-    '1.5'
+    "1.4"
 )
 
 url=\
 (
-    "http://downloads.sourceforge.net/project/bridge/bridge/bridge-utils-$version.tar.gz"
+    "http://downloads.sourceforge.net/project/bridge/bridge/bridge-utils-$version/bridge-utils-$version.tar.gz"
 )
 
 md5=\
 (
-    'ec7b381160b340648dede58c31bb2238'
+    "0182fcac3a2b307113bbec34e5f1c673"
 )
 
 maintainer=\
 (
-    'Ricardo Martins <rasm@fe.up.pt>'
+    "Ricardo Martins <rasm@fe.up.pt>"
 )
 
 post_unpack()
 {
-    patches=$(ls "$pkg_dir/patches-$version/"*.patch 2>/dev/null)
-    if [ -n "$patches" ]; then
-        cat $patches | patch -p1
-    fi &&
-
-    autoreconf
+    cd ../bridge-utils-$version && autoreconf
 }
 
 configure()

packages/busybox/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '1.22.0'
+    "1.20.2"
 )
 
 url=\
@@ -10,12 +10,12 @@ url=\
 
 md5=\
 (
-    'ac1881d1cdeb0729b22c663feaf1c663'
+    "e025414bc6cd79579cc7a32a45d3ae1c"
 )
 
 post_unpack()
 {
-    patches=$(ls "$pkg_dir"/patches/*.patch)
+    patches=$(ls "$cfg_package_spec_dir"/patches/*.patch)
 
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
@@ -24,7 +24,7 @@ post_unpack()
 
 configure()
 {
-    cp "$pkg_dir"/config .config &&
+    cp "$cfg_package_spec_dir"/config .config &&
     yes '' | $cmd_make CROSS_COMPILE="$cfg_target_canonical"- oldconfig
 }
 
@@ -36,5 +36,5 @@ build()
 target_install()
 {
     $cmd_make CROSS_COMPILE="$cfg_target_canonical"- CONFIG_PREFIX=$cfg_dir_rootfs install &&
-    tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+    tar -C "$cfg_package_spec_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }

packages/bzip2/default.bash

@@ -1,4 +1,4 @@
-source $pkg_common
+source $PKG_COMMON
 
 
 configure()

packages/bzip2/host.bash

@@ -1,4 +1,4 @@
-source $pkg_common
+source $PKG_COMMON
 
 build()
 {

packages/collectd/default.bash

@@ -88,7 +88,7 @@ target_install()
   # Collectd:
   $cmd_mkdir "$cfg_dir_rootfs/usr/share/"
   $cmd_cp    "$cfg_dir_toolchain_sysroot/usr/share/collectd/" "$cfg_dir_rootfs/usr/share/"
-  $cmd_cp    "${pkg_dir}/fs/etc/rc.d/collectd"   "$cfg_dir_rootfs/etc/rc.d/"
+  $cmd_cp    "${cfg_package_spec_dir}/fs/etc/rc.d/collectd"   "$cfg_dir_rootfs/etc/rc.d/"
 
   # Configuration:
   echo "# Client

packages/db/default.bash

@@ -5,7 +5,7 @@ version=\
 
 url=\
 (
-    "ftp://mirror.ovh.net/gentoo-distfiles/distfiles/db-$version.tar.gz"
+    "http://www.lsts.pt/glued/db-$version.tar.gz"
 )
 
 md5=\

packages/desert/default.bash

@@ -25,7 +25,7 @@ requires=\
 
 post_unpack()
 {
-    patches=$(ls "$pkg_dir/patches/"*.patch)
+    patches=$(ls "$cfg_package_spec_dir/patches/"*.patch)
     if [ -n "$patches" ]; then
         cat $patches | patch -p0
     fi

packages/dnsmasq/default.bash

@@ -26,5 +26,6 @@ build()
 
 target_install()
 {
-    $cmd_target_strip src/dnsmasq -o "$cfg_dir_rootfs/usr/sbin/dnsmasq"
+    $cmd_target_strip src/dnsmasq -o "$cfg_dir_rootfs/usr/sbin/dnsmasq" &&
+        tar -C "$cfg_package_spec_dir/fs" -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }

packages/dnsmasq/fs/etc/rc.d/dnsmasq

@@ -0,0 +1,10 @@
+start()
+{
+    mkdir -p /var/lib/misc
+    dnsmasq
+}
+
+stop()
+{
+    killall dnsmasq
+}

packages/dropbear/default.bash

@@ -25,7 +25,7 @@ requires=\
 
 post_unpack()
 {
-    patches=$(ls "$pkg_dir/patches/"*.patch)
+    patches=$(ls "$cfg_package_spec_dir/patches/"*.patch)
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
     fi
@@ -62,5 +62,5 @@ target_install()
     ln -fs dropbearmulti "$cfg_dir_rootfs/usr/bin/ssh" &&
     ln -fs dropbearmulti "$cfg_dir_rootfs/usr/bin/dbclient" &&
     ln -fs ../bin/dropbearmulti "$cfg_dir_rootfs/usr/sbin/dropbear" &&
-    tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+    tar -C "$cfg_package_spec_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }

packages/e2fsprogs/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '1.41.9'
+    '1.42.13'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    '52f60a9e19a02f142f5546f1b5681927'
+    'bc759fc62666786f5436e2075beb3265'
 )
 
 configure()

packages/eglibc/common.bash

@@ -18,13 +18,13 @@ maintainer=\
     'Ricardo Martins <rasm@fe.up.pt>'
 )
 
-build_dir=$pkg_var
+build_dir=$PKG_VAR
 
 post_unpack()
 {
     ln -fs ../ports ../eglibc-$version/libc/ports
 
-    patches=$(ls "$pkg_dir"/patches/*.patch)
+    patches=$(ls "$cfg_package_spec_dir"/patches/*.patch)
 
     cd ../eglibc-$version
     if [ -n "$patches" ]; then

packages/eglibc/cross.bash

@@ -1,4 +1,4 @@
-source $pkg_common
+source $PKG_COMMON
 
 requires=\
 (
@@ -13,7 +13,7 @@ build()
 host_install()
 {
     $cmd_make install_root="$cfg_dir_toolchain_sysroot" -j1 install &&
-    cp "$pkg_dir"/files/timepps.h "$cfg_dir_toolchain_sysroot/usr/include"
+    cp "$cfg_package_spec_dir"/files/timepps.h "$cfg_dir_toolchain_sysroot/usr/include"
 }
 
 target_install()
@@ -33,5 +33,5 @@ target_install()
 
     $cmd_target_strip -v --strip-unneeded "elf/ldconfig" \
         -o "$cfg_dir_rootfs/sbin/ldconfig" &&
-    tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+    tar -C "$cfg_package_spec_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }

packages/eglibc/headers.bash

@@ -1,4 +1,4 @@
-source $pkg_common
+source $PKG_COMMON
 
 requires=\
 (

packages/eglibc/locales.bash

@@ -1,4 +1,4 @@
-source $pkg_common
+source $PKG_COMMON
 
 requires=\
 (

packages/escc/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '1.0.4'
+    '1.0.6'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    'b9ee6a3d921643535c336b7c740b2c60'
+    '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,9 +40,9 @@ 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 &&
 
-    tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+    tar -C "$cfg_package_spec_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }

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

@@ -0,0 +1,15 @@
+# Channels:
+# * 0: Honeywell HG1700
+# * 1: LSTS 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

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

@@ -0,0 +1,11 @@
+# Channels:
+# * 0: Honeywell HG1700
+
+# Create channels.
+/usr/bin/setescc 0 0x200 5 0 0 0
+
+# 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
-/usr/bin/setescc 0 0x200 5 0 0 0
-/usr/bin/esccsettings 0 /etc/escc/ifog-imu-1-a.cfg
+# Channels:
+# * 0: iMAR iFOG-IMU-1-A
+# * 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/europa/default.bash

@@ -27,7 +27,7 @@ requires=\
 
 post_unpack()
 {
-    patches=$(ls "$pkg_dir"/patches-$version/*.patch)
+    patches=$(ls "$cfg_package_spec_dir"/patches-$version/*.patch)
 
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
@@ -37,7 +37,7 @@ post_unpack()
 build()
 {
     OLD_PATH="$PATH"
-    export PATH="$pkg_dir/compat:$PATH"
+    export PATH="$cfg_package_spec_dir/compat:$PATH"
     export PLASMA_HOME="$PWD/../europa-$version"
     export EUROPA_HOME="$cfg_dir_toolchain_sysroot/usr"
 

packages/expect/default.bash

@@ -21,7 +21,7 @@ requires=\
 post_unpack()
 {
     cd ../expect${version}
-    patches=$(ls "$pkg_dir/patches/"*.patch)
+    patches=$(ls "$cfg_package_spec_dir/patches/"*.patch)
     if [ -n "$patches" ]; then
         cat $patches | patch -p1
     fi

packages/fconfig/default.bash

@@ -15,7 +15,7 @@ md5=\
 
 post_unpack()
 {
-    patch -d ../fconfig -p1 < "$pkg_dir"/patches/limits.patch
+    patch -d ../fconfig -p1 < "$cfg_package_spec_dir"/patches/limits.patch
 }
 
 build()

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

@@ -0,0 +1,13 @@
+start()
+{
+    mount -t debugfs debugfs /sys/kernel/debug &&
+
+    # UART1.
+    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,9 +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 &&
-    if [ -f $dune_base/etc/*-saved.ini ]; then
-        cp "$dune_base/etc/"*-saved.ini "$dune_base/.dune-upgrade/"dune-*/etc 2> /dev/null
-    fi &&
+    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")"