Renamed sc-1 aux.

.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

architectures/arm-11.cfg

@@ -1,6 +1,5 @@
 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=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=softfp -mfpu=vfpv3'
 cfg_target_gcc_configure_flags='--with-arch=armv7-a --with-cpu=arm1176jzf-s --with-tune=arm1176jzf-s --with-fpu=vfpv3 --with-float=softfp'
 cfg_target_ar_flags='elf32-littlearm'

architectures/cortex-a8.cfg

@@ -1,6 +1,6 @@
 cfg_target_canonical="armv7-$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-a8 -mtune=cortex-a8 -mfloat-abi=softfp -mfpu=vfpv3'
 cfg_target_gcc_configure_flags='--with-arch=armv7-a --with-cpu=cortex-a8 --with-tune=cortex-a8 --with-fpu=vfpv3 --with-float=softfp'
 cfg_target_ar_flags='elf32-littlearm'
+cfg_target_uboot_arch='arm'

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.12.0'
+cfg_glued_version='1.9.1'
 # Config: GLUED vendor.
 cfg_glued_vendor='lsts'
 
@@ -90,15 +88,14 @@ if ! [ -f "architectures/$cfg_architecture.cfg" ]; then
 fi
 source "architectures/$cfg_architecture.cfg"
 
-# Create a MAC address based on the IP address if cfg_eth_ext_soft_mac
+# Creating the mac address if not set in configuration file we create one derivated from the IP address:
-# is set.
+if [ -n $cfg_eth_ext_ip ]; then
-if [ -n "$cfg_eth_ext_ip" ] && [ -n "$cfg_eth_ext_soft_mac" ]; then
+  ips=(`echo $cfg_eth_ext_ip | sed -e 's/\./\n/g'`)
-    ips=(`echo $cfg_eth_ext_ip | sed -e 's/\./\n/g'`)
+  for i in "${ips[@]}"
-    for i in "${ips[@]}"
+  do
-    do
+    hip=("${hip[@]}" `printf '%x' $i`)
-        hip=("${hip[@]}" `printf '%x' $i`)
+  done
-    done
+  cfg_eth_ext_mac="80:c1:${hip[0]}:${hip[1]}:${hip[2]}:${hip[3]}"
-    cfg_eth_ext_mac="80:c1:${hip[0]}:${hip[1]}:${hip[2]}:${hip[3]}"
 fi
 
 # Config: system name.
@@ -112,7 +109,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()
 {
@@ -95,7 +93,7 @@ create_part_root()
         || die
 
     nfo2 "Creating filesystem"
-    "$cmd_mkfs_ext2" -q -F -L "$part_label" "$part_dev" > /dev/null 2>&1 || die
+    mkfs.ext2 -q -L "$part_label" "$part_dev" || die
 
     nfo2 "Populating filesystem"
     cmd_mount ext2 "$part_dev" || die
@@ -128,7 +126,7 @@ create_part_data()
         || die
 
     nfo2 "Creating filesystem"
-    "$cmd_mkfs_ext4" -q -F -L "$part_label" -O dir_index "$part_dev" > /dev/null 2>&1 || die
+    mkfs.ext4 -q -L "$part_label" -O dir_index "$part_dev" || die
 
     nfo2 "Populating filesystem"
     cmd_mount ext4 "$part_dev" || die
@@ -167,13 +165,6 @@ else
     cmd_parted="parted"
 fi
 
-if [ -x "$cfg_dir_toolchain/sbin/fdisk" ]; then
-    cmd_fdisk="$cfg_dir_toolchain/sbin/fdisk"
-else
-    echo "Warning: using system fdisk, this might lead to errors"
-    cmd_fdisk="fdisk"
-fi
-
 if [ -x "$cfg_dir_toolchain/sbin/mkdosfs" ]; then
     cmd_mkdosfs="$cfg_dir_toolchain/sbin/mkdosfs"
 else
@@ -181,20 +172,6 @@ else
     cmd_mkdosfs="mkdosfs"
 fi
 
-if [ -x "$cfg_dir_toolchain/sbin/mkfs.ext2" ]; then
-    cmd_mkfs_ext2="$cfg_dir_toolchain/sbin/mkfs.ext2"
-else
-    echo "Warning: using system mkfs.ext2, this might lead to errors"
-    cmd_mkfs_ext2="mkfs.ext2"
-fi
-
-if [ -x "$cfg_dir_toolchain/sbin/mkfs.ext4" ]; then
-    cmd_mkfs_ext4="$cfg_dir_toolchain/sbin/mkfs.ext4"
-else
-    echo "Warning: using system mkfs.ext4, this might lead to errors"
-    cmd_mkfs_ext4="mkfs.ext4"
-fi
-
 source "functions.bash"
 
 dev="$2"
@@ -236,7 +213,6 @@ cmd_parted "$dev_loop" \
     || die
 
 part_nr=1
-xboot_system_id=0
 for ((i = 0; i < ${#cfg_partitions[@]}; i += 4)); do
     part_type="${cfg_partitions[$i+0]}"
     part_label="${cfg_partitions[$i+1]}"
@@ -247,7 +223,6 @@ for ((i = 0; i < ${#cfg_partitions[@]}; i += 4)); do
     case $part_type in
         'x-boot')
             create_part_xboot
-            xboot_system_id=1
             ;;
         'root')
             create_part_root
@@ -273,10 +248,5 @@ nfo1 "Synchronizing caches"
 sync && sync && sync && sync && sync && sync
 blockdev --flushbufs "$dev_loop" || die
 
-# Make sure the partition has 0x0e type.
-if [ $xboot_system_id -eq 1 ]; then
-    echo -en "t\n1\ne\nw\n" | $cmd_fdisk "$dev_loop" > /dev/null 2>&1
-fi
-
 nfo1 "Detaching loop device $dev_loop"
 losetup -v -d "$dev_loop"

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"
+                    err "failed to execute rule $rule of $PKG / $PKG_VAR"
-                    tail "$cfg_dir_builds/$pkg/$pkg_var/$rule.log"
+                    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="$pkg"
-export pkg_var
+export PKG_VAR="$pkg_var"
-export pkg_common="$cfg_dir_rules/$pkg/common.bash"
+export PKG_COMMON="$cfg_dir_packages/$PKG/common.bash"
 
-if ! [ -d "$cfg_dir_rules/$pkg" ]; then
+if ! [ -d "$cfg_dir_packages/$PKG" ]; then
-    echo "ERROR: package '$pkg' does not exist."
+    echo "ERROR: package '$PKG' does not exist."
     exit 1
 fi
 
-if ! [ -f "$cfg_dir_rules/$pkg/$pkg_var.bash" ]; then
+if ! [ -f "$cfg_dir_packages/$PKG/$PKG_VAR.bash" ]; then
-    echo "ERROR: variant '$pkg_var' of package '$pkg' does not exist."
+    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
+if [ -e "$cfg_dir_postconfiguration/$PKG/$cfg_sys_name.bash" ]; then
-#    echo "ERROR: postconfiguration exists '$pkg'."
+#    echo "ERROR: postconfiguration exists '$PKG'."
-#    echo "$cfg_dir_postconfiguration/$pkg/$cfg_sys_name.bash"
+#    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-ant/host.bash

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

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/apr-util/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '1.5.3'
+    '1.5.2'
 )
 
 url=\

packages/apr/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '1.5.1'
+    '1.4.6'
 )
 
 url=\

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/base/host.bash

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

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

@@ -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
         cd "../boost_$vendor_version" &&  cat $patches | patch -p1
     fi

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)
+    cd ../bridge-utils-$version && autoreconf
-    if [ -n "$patches" ]; then
-        cat $patches | patch -p1
-    fi &&
-
-    autoreconf
 }
 
 configure()

packages/busybox/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '1.22.1'
+    "1.20.2"
 )
 
 url=\
@@ -10,12 +10,12 @@ url=\
 
 md5=\
 (
-    '337d1a15ab1cb1d4ed423168b1eb7d7e'
+    "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/cdk/default.bash

@@ -0,0 +1,53 @@
+version=\
+(
+  "5.0-20120323"
+)
+
+url=\
+(
+  "ftp://invisible-island.net/cdk/cdk.tar.gz"
+)
+
+md5=\
+(
+  "929969d06ce034e862976bb7d1a36b25"
+)
+
+requires=\
+(
+    'ncurses/default'
+)
+
+configure()
+{
+#        --target="${cfg_target_canonical}" \
+  ./configure \
+    --prefix="$cfg_dir_toolchain_sysroot/usr" \
+    --host="${cfg_target_canonical}" \
+    --build="${cfg_host_canonical}" \
+        --target="${cfg_target_canonical}" \
+    --with-ncursesw \
+    --with-shared   \
+
+}
+
+build()
+{
+  $cmd_make
+}
+
+host_install()
+{
+  $cmd_make install
+}
+
+target_install()
+{
+  for f in "$cfg_dir_toolchain_sysroot/usr/lib/libcdk"* ; do
+    if [ -L "$f" ]; then
+      cp -av "$f" "$cfg_dir_rootfs/usr/lib"
+    else
+      $cmd_target_strip -v "$f" -o "$cfg_dir_rootfs/usr/lib/$(basename "$f")"
+    fi
+  done
+}

packages/cmake/host.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    "2.8.9"
+    "2.8.8"
 )
 
 version_major=\
@@ -15,7 +15,7 @@ url=\
 
 md5=\
 (
-    "801f4c87f8b604f727df5bf1f05a59e7"
+    "ba74b22c788a0c8547976b880cd02b17"
 )
 
 configure()
@@ -26,12 +26,10 @@ configure()
 
 build()
 {
-    # Remove the trailling 'ncurses' folder from the CURSES_INCLUDE_PATH
-    cat CMakeCache.txt | sed  '/^CURSES_INCLUDE_PATH/s/\/ncurses$/\//g' > CMakeCache.txt  &&
     $cmd_make
 }
 
 host_install()
 {
-    $cmd_make DESTDIR="$cfg_dir_toolchain" install
+    $cmd_make install
 }

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/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/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/dtn/default.bash

@@ -76,5 +76,5 @@ target_install()
     $cmd_target_strip daemon/dtnd -o "$cfg_dir_rootfs/usr/bin/dtnd" &&
     $cmd_mkdir "$cfg_dir_rootfs/etc/dtn" "$cfg_dir_rootfs/usr/share/dtn" &&
     cp servlib/conv_layers/clevent.xsd "$cfg_dir_rootfs/usr/share/dtn" &&
-    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,9 +1,20 @@
-source "$pkg_common"
+version=\
+(
+    '1.41.9'
+)
+
+url=\
+(
+    "http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-$version.tar.gz"
+)
+
+md5=\
+(
+    '52f60a9e19a02f142f5546f1b5681927'
+)
 
 configure()
 {
-    $cmd_make distclean
-
     export CC=$cmd_target_cc
     export CROSS_COMPILE=$cfg_target_canonical
     "../e2fsprogs-$version/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.5'
+    '1.0.3'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    '8400860f2daa98d559b1b9b6fcc630c2'
+    'd8729636cc2d7f46f62141d392898bfa'
 )
 
 if [ -d "$cfg_dir_builds/linux/linux-"* ]; then
@@ -44,5 +44,5 @@ target_install()
         $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/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()