Marking version 1.9.4.

escc: script to configure hg1700 plus psimar.
Marking version 1.9.3.
2014-01-28 10:49:04 +00:00 · 2014-01-28 10:39:11 +00:00 · 2014-01-27 18:00:38 +00:00 · 2014-01-27 17:57:08 +00:00 · 2014-01-27 17:48:37 +00:00 · 2014-01-27 17:47:38 +00:00
658 changed files with 6632 additions and 38397 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,8 @@
-/downloads
-/lctr-a4xx
-/lctr-a6xx
-/lctr-a8xx
-/lctr-a9xx
-/lctr-b1xx
-/lctr-b2xx
-/qemu-i686
-/lauv-aux
-/lauv-aux-rpi
-/ntnu-b2xx
-/stamp9g20
-/lctr-rpi
+downloads
+lctr-a4xx
+lctr-a6xx
+lctr-a8xx
+lctr-a9xx
+lctr-b1xx
+lctr-b2xx
+qemu-i686
--- a/architectures/arm-1176.cfg
+++ b/architectures/arm-1176.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-mcpu=arm1176jzf-s --with-mtune=arm1176jzf-s --with-fpu=vfpv3 --with-float=softfp'
+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'
--- a/architectures/arm926ej-s.cfg
+++ b/architectures/arm926ej-s.cfg
@@ -1,4 +0,0 @@
-cfg_target_canonical="armv5te-$cfg_glued_vendor-linux-gnueabi"
-cfg_target_linux='arm'
-cfg_target_gcc_flags='-O2 -pipe -funit-at-a-time -mtune=arm926ej-s -mfloat-abi=soft'
-cfg_target_gcc_configure_flags='--with-arch=armv5te --with-mtune=arm926ej-s --with-float=soft'
--- a/architectures/atom.cfg
+++ b/architectures/atom.cfg
@@ -1,4 +1,4 @@
 cfg_target_canonical="atom-$cfg_glued_vendor-linux-gnu"
 cfg_target_linux='x86'
 cfg_target_linux_kernel='arch/x86/boot/bzImage'
-cfg_target_gcc_configure_flags='--with-arch=atom --with-mcpu=atom --with-mtune=atom'
+cfg_target_gcc_configure_flags='--with-arch=atom --with-cpu=atom --with-tune=atom'
--- a/architectures/atom64.cfg
+++ b/architectures/atom64.cfg
@@ -1,6 +1,6 @@
 cfg_target_canonical="atom64-$cfg_glued_vendor-linux-gnu"
 cfg_target_linux='x86'
 cfg_target_gcc_flags='-O2 -pipe -march=atom -funit-at-a-time'
-cfg_target_gcc_configure_flags='--with-mcpu=x86-64 --with-mtune=atom'
+cfg_target_gcc_configure_flags='--with-cpu=x86-64 --with-tune=atom'
 cfg_target_linux_kernel='arch/x86/boot/bzImage'
 cfg_target_lib64='yes'
--- a/architectures/cortex-a8-hardfp.cfg
+++ b/architectures/cortex-a8-hardfp.cfg
@@ -1,6 +0,0 @@
-cfg_target_canonical="armv7-$cfg_glued_vendor-linux-gnueabihf"
-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=hard -mfpu=vfpv3'
-cfg_target_gcc_configure_flags='--with-arch=armv7-a --with-mcpu=cortex-a8 --with-mtune=cortex-a8 --with-fpu=vfpv3 --with-float=hard'
-cfg_target_ar_flags='elf32-littlearm'
--- a/architectures/cortex-a8.cfg
+++ b/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-mcpu=cortex-a8 --with-mtune=cortex-a8 --with-fpu=vfpv3 --with-float=softfp'
+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'
--- a/architectures/cortex-a9-hardfp.cfg
+++ b/architectures/cortex-a9-hardfp.cfg
@@ -1,6 +0,0 @@
-cfg_target_canonical="armv7-$cfg_glued_vendor-linux-gnueabihf"
-cfg_target_linux='arm'
-cfg_target_uboot_arch='arm'
-cfg_target_gcc_flags='-O2 -pipe -funit-at-a-time -mcpu=cortex-a9 -mtune=cortex-a9 -mfloat-abi=hard -mfpu=vfpv3'
-cfg_target_gcc_configure_flags='--with-arch=armv7-a --with-mcpu=cortex-a9 --with-mtune=cortex-a9 --with-fpu=vfpv3 --with-float=hard'
-cfg_target_ar_flags='elf32-littlearm'
--- a/architectures/geode.cfg
+++ b/architectures/geode.cfg
@@ -1,3 +1,3 @@
 cfg_target_canonical="geode-$cfg_glued_vendor-linux-gnu"
 cfg_target_linux='x86'
-cfg_target_gcc_configure_flags='--with-arch=geode --with-mcpu=geode --with-mtune=geode'
+cfg_target_gcc_configure_flags='--with-arch=geode --with-cpu=geode --with-tune=geode'
--- a/architectures/i586.cfg
+++ b/architectures/i586.cfg
@@ -1,5 +1,5 @@
 cfg_target_canonical="i586-$cfg_glued_vendor-linux-gnu"
 cfg_target_linux='x86'
-cfg_target_gcc_configure_flags='--with-arch=i586 --with-mcpu=i586 --with-mtune=i586'
+cfg_target_gcc_configure_flags='--with-arch=i586 --with-cpu=i586 --with-tune=i586'
 cfg_target_gcc_flags='-O2 -pipe -march=i586 -funit-at-a-time'
-cfg_target_glibc_configure_flags='--with-cpu=i586'
+cfg_target_eglibc_configure_flags='--with-cpu=i586'
--- a/architectures/i686.cfg
+++ b/architectures/i686.cfg
@@ -1,6 +1,6 @@
 cfg_target_canonical="i686-$cfg_glued_vendor-linux-gnu"
 cfg_target_linux='x86'
 cfg_target_gcc_flags='-O2 -pipe -march=i686 -funit-at-a-time'
-cfg_target_gcc_configure_flags='--mwith-cpu=i686'
-cfg_target_glibc_configure_flags='--with-mcpu=i686'
+cfg_target_gcc_configure_flags='--with-cpu=i686'
+cfg_target_eglibc_configure_flags='--with-cpu=i686'
 cfg_target_linux_kernel='arch/x86/boot/bzImage'
--- a/architectures/mips32r2.cfg
+++ b/architectures/mips32r2.cfg
@@ -1,5 +1,5 @@
 cfg_target_canonical="mipsisa32r2-$cfg_glued_vendor-linux-gnu"
 cfg_target_linux='mips'
 cfg_target_gcc_flags='-O2 -pipe -funit-at-a-time -mabi=32 -mips32r2 -mtune=mips32r2 -msoft-float'
-cfg_target_gcc_configure_flags='--with-abi=32 --with-mtune=mips32r2 --with-float=soft'
-cfg_target_glibc_configure_flags='--without-fp'
+cfg_target_gcc_configure_flags='--with-abi=32 --with-tune=mips32r2 --with-float=soft'
+cfg_target_eglibc_configure_flags='--without-fp'
--- a/architectures/xscale-iwmmxt.cfg
+++ b/architectures/xscale-iwmmxt.cfg
@@ -1,4 +1,4 @@
 cfg_target_canonical="armv5-$cfg_glued_vendor-linux-gnueabi"
 cfg_target_linux='arm'
 cfg_target_gcc_flags='-O2 -pipe -funit-at-a-time -mcpu=iwmmxt -mtune=iwmmxt -mfloat-abi=soft'
-cfg_target_gcc_configure_flags='--with-arch=iwmmxt --with-mcpu=iwmmxt --with-mtune=iwmmxt --with-float=soft'
+cfg_target_gcc_configure_flags='--with-arch=iwmmxt --with-cpu=iwmmxt --with-tune=iwmmxt --with-float=soft'
--- a/architectures/xscale.cfg
+++ b/architectures/xscale.cfg
@@ -1,4 +1,4 @@
 cfg_target_canonical="armv5-$cfg_glued_vendor-linux-gnueabi"
 cfg_target_linux='arm'
 cfg_target_gcc_flags='-O2 -pipe -funit-at-a-time -mtune=xscale -mfloat-abi=soft'
-cfg_target_gcc_configure_flags='--with-arch=armv5te --with-mtune=xscale --with-float=soft'
+cfg_target_gcc_configure_flags='--with-arch=armv5te --with-tune=xscale --with-float=soft'
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,48 +0,0 @@
-###########################################################################
-# GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2016 OceanScan - Marine Systems & Technology, Lda.        #
-###########################################################################
-# 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.                                                         #
-###########################################################################
-# Author: Ricardo Martins                                                 #
-###########################################################################
-
-FROM debian:8
-
-MAINTAINER Ricardo Martins <rasm@oceanscan-mst.com>
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# Update distro.
-RUN echo "deb http://ftp.us.debian.org/debian testing non-free contrib" >> /etc/apt/sources.list
-RUN echo "deb http://mirrors.fe.up.pt/ubuntu xenial main restricted universe multiverse" >> /etc/apt/sources.list
-RUN echo "deb http://mirrors.fe.up.pt/ubuntu xenial-updates main restricted universe multiverse" >> /etc/apt/sources.list
-RUN echo "deb http://mirrors.fe.up.pt/ubuntu xenial-backports main restricted universe multiverse" >> /etc/apt/sources.list
-RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 3B4FE6ACC0B21F32
-RUN apt-get update -y
-RUN apt-get dist-upgrade -y
-RUN apt-get install -y g++-5
-RUN apt-get install -y gcc-5
-RUN apt-get install -y wget
-RUN apt-get install -y bzip2
-RUN apt-get install -y git
-RUN apt-get install -y g++-multilib
-RUN apt-get install -y file
-RUN apt-get install -y vim
-RUN apt-get install -y nasm
-RUN apt-get install -y build-essential
-RUN apt-get install -y make
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 60 --slave /usr/bin/g++ g++ /usr/bin/g++-5
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,40 +0,0 @@
-###########################################################################
-# GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2016 OceanScan - Marine Systems & Technology, Lda.        #
-###########################################################################
-# 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.                                                         #
-###########################################################################
-# Author: Ricardo Martins                                                 #
-###########################################################################
-
-TAG     := glued
-VERSION := 2016.05.0
-VOLUME  := $(CURDIR)/..
-
-all:
-	docker build -t $(TAG):$(VERSION) .
-
-shell:
-	docker run -w $(VOLUME) -i -a stdin -a stdout -v $(VOLUME):$(VOLUME) -t $(TAG):$(VERSION)
-
-clean:
-	@echo "* Stopping docker service..."
-	@sudo systemctl stop docker
-	@echo "* Cleaning docker service..."
-	@sudo rm -rf /var/lib/docker
-	@echo "* Starting docker service..."
-	@sudo systemctl start docker
-	@echo "* Done."
--- a/functions.bash
+++ b/functions.bash
@@ -1,6 +1,6 @@
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 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()
 {
@@ -40,15 +38,3 @@ err()
 {
    echo -e "[$(date +"%Y-%m-%d %H:%M:%S")] \033[0m\033[1;31mERROR: $*\033[0m"
 }
-
-ucat()
-{
-    case "$1" in
-        *.gz)
-            zcat "$1"
-            ;;
-        *)
-            cat "$1"
-            ;;
-    esac
-}
--- a/utils/mkbackup.bash
+++ b/utils/mkbackup.bash
@@ -27,7 +27,7 @@ tar czf "$1/${backupsystem}_backup/${backupfile}" \
  architectures \
  scripts \
  product \
-  rules \
+  packages \
  systems

 echo "Done ... "
--- a/mkconfig.bash
+++ b/mkconfig.bash
@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 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='2016.05'
+cfg_glued_version='1.9.4'
 # Config: GLUED vendor.
 cfg_glued_vendor='lsts'

@@ -90,9 +88,8 @@ 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
-# is set.
-if [ -n "$cfg_eth_ext_ip" ] && [ -n "$cfg_eth_ext_soft_mac" ]; then
+# Creating the mac address if not set in configuration file we create one derivated from the IP address:
+if [ -n $cfg_eth_ext_ip ]; then
  ips=(`echo $cfg_eth_ext_ip | sed -e 's/\./\n/g'`)
  for i in "${ips[@]}"
  do
@@ -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.
@@ -166,19 +163,6 @@ if [ -z $cfg_toolchain_tar ]; then
    cfg_toolchain_tar="$cfg_dir_base/$cfg_sys_family/glued-$cfg_glued_version-$cfg_sys_family-toolchain-$cfg_host_canonical-$cfg_target_canonical.tar.bz2"
 fi

-# Config: Git revision.
-git_branch=$(echo $(git rev-parse --symbolic-full-name --abbrev-ref HEAD 2> /dev/null))
-git_revision=$(echo $(git rev-parse --short HEAD 2> /dev/null))
-git_status=$(echo $(git status -s 2> /dev/null))
-if [ -z "$git_branch" ] || [ -z "$git_revision" ]; then
-    cfg_glued_git_version='unknown'
-else
-    cfg_glued_git_version="$git_branch-$git_revision"
-    if [ -n "$git_status" ]; then
-        cfg_glued_git_version="$cfg_glued_git_version-dirty"
-    fi
-fi
-
 if ! [ -d "$cfg_sys_family" ]; then
    mkdir -p "$cfg_sys_family"
 fi &&
--- a/mkdisk.bash
+++ b/mkdisk.bash
@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 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,21 +19,19 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA           #
 # 02110-1301 USA.                                                         #
 ###########################################################################
-# Author: Ricardo Martins                                                 #
-###########################################################################

 cmd_parted()
 {
-    bdev="$1"; shift
-    "$cmd_parted" "$bdev" -a cylinder -s -- $@
+    dev="$1"; shift
+    "$cmd_parted" "$dev" -a cylinder -s -- $@
 }

 cmd_mount()
 {
    fs="$1"
-    bdev="$2"
+    dev="$2"
    mkdir -p mount &&
-    mount -t "$fs" "$bdev" mount
+    mount -t "$fs" "$dev" mount
 }

 cmd_unmount()
@@ -47,7 +45,7 @@ cmd_unmount()

 die()
 {
-    umount -v mount > /dev/null 2>&1
+    umount mount > /dev/null 2>&1
    rmdir mount > /dev/null 2>&1
    [ -n "$dev_loop" ] && losetup -d "$dev_loop"
    exit 1
@@ -70,7 +68,7 @@ create_part_xboot()
    nfo2 "Populating filesystem"
    cmd_mount vfat "$part_dev" || die

-    for f in MLO u-boot.img uEnv.txt kernel; do
+    for f in MLO u-boot.img uEnv.txt; do
        if [ -f "$cfg_sys_family/rootfs/boot/$f" ]; then
            nfo2 installing $f to boot partition
            cp "$cfg_sys_family/rootfs/boot/$f" mount || die
@@ -84,44 +82,6 @@ create_part_xboot()
    cmd_parted "$dev_loop" print > /dev/null
 }

-create_part_rpiboot()
-{
-    nfo1 "RPi-Boot partition ($part_label)"
-
-    nfo2 "Creating partition"
-    cmd_parted "$dev_loop" \
-        mkpart primary fat32 "$part_start" "$part_end" \
-        set "$part_nr" boot on \
-        align-check minimal "$part_nr" \
-        || die
-
-    nfo2 "Creating filesystem"
-    $cmd_mkdosfs -n "$part_label" "$part_dev" > /dev/null || die
-
-    nfo2 "Populating filesystem"
-    cmd_mount vfat "$part_dev" || die
-
-    for f in "$cfg_sys_family/rootfs/boot/"*; do
-        nfo2 installing $f to boot partition
-        cp -r "$f" mount || die
-    done
-
-    nfo2 renaming kernel to kernel7.img
-    mv mount/kernel mount/kernel7.img
-
-    if [ -f mount/board.dtb ]; then
-        dtb=$(basename "$cfg_target_linux_dtb")
-        nfo2 renaming board.dtb to "$dtb"
-        mv "mount/board.dtb" "mount/$dtb"
-    fi
-
-    cmd_parted "$dev_loop" \
-        set "$part_nr" lba on \
-        || die
-
-    cmd_parted "$dev_loop" print > /dev/null
-}
-
 create_part_root()
 {
    nfo1 "Root partition ($part_label)"
@@ -133,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
@@ -166,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
@@ -205,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
@@ -219,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"
@@ -255,10 +194,8 @@ if [ -z "$cfg_partitions" ]; then
    )
 fi

-cmd_loop_attach()
-{
-    export dev="$1"
-    export dev_loop="$(losetup -f)"
+# Loop device.
+dev_loop="$(losetup -f)"

 nfo1 "Attaching $dev to $dev_loop"
 losetup -v "$dev_loop" "$dev"
@@ -266,35 +203,17 @@ cmd_loop_attach()
    unset dev_loop
    die
 fi
-}
-
-cmd_loop_detach()
-{
-    nfo1 "Detaching $dev_loop"
-    sync && sync && sync && sync
-    blockdev --flushbufs "$dev_loop"
-    losetup -v -d "$dev_loop"
-    sync && sync && sync && sync
-    unset dev_loop
-}

 nfo1 "Obliterating partition table"
-cmd_loop_attach "$dev"
 dd if=/dev/zero of="$dev_loop" bs=1 count=1M count=32 > /dev/null 2>&1 || die
-losetup -a
-cmd_loop_detach
-losetup -a

 nfo1 "Creating empty partition table"
-cmd_loop_attach "$dev"
-cmd_parted "$dev_loop" mklabel msdos || die
-cmd_loop_detach
+cmd_parted "$dev_loop" \
+    mklabel msdos \
+    || die

 part_nr=1
-xboot_system_id=0
 for ((i = 0; i < ${#cfg_partitions[@]}; i += 4)); do
-    cmd_loop_attach "$dev"
-
    part_type="${cfg_partitions[$i+0]}"
    part_label="${cfg_partitions[$i+1]}"
    part_start="${cfg_partitions[$i+2]}"
@@ -304,11 +223,6 @@ for ((i = 0; i < ${#cfg_partitions[@]}; i += 4)); do
    case $part_type in
        'x-boot')
            create_part_xboot
-            xboot_system_id=1
-            ;;
-        'rpi-boot')
-            create_part_rpiboot
-            xboot_system_id=1
            ;;
        'root')
            create_part_root
@@ -322,23 +236,17 @@ for ((i = 0; i < ${#cfg_partitions[@]}; i += 4)); do
            ;;
    esac

-    cmd_loop_detach
    let part_nr++
 done

 if [ -f "$cfg_sys_family/rootfs/boot/extlinux/mbr.bin" ]; then
    nfo1 "Installing bootloader in MBR..."
-    cmd_loop_attach "$dev"
    dd if="$cfg_sys_family/rootfs/boot/extlinux/mbr.bin" of="$dev_loop" > /dev/null 2>&1
-    cmd_loop_detach
 fi

 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
-    cmd_loop_attach "$dev"
-    echo -en "t\n1\ne\nw\n" | $cmd_fdisk "$dev_loop" > /dev/null 2>&1
-    cmd_loop_detach
-fi
+nfo1 "Detaching loop device $dev_loop"
+losetup -v -d "$dev_loop"
--- a/utils/mknfs.bash
+++ b/utils/mknfs.bash
--- a/mkpackage.bash
+++ b/mkpackage.bash
@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 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"

@@ -31,12 +29,11 @@ download_tool()
        return 0
    fi

-    curl -f -C - "$1" -o "$2"
+    curl -C - "$1" -o "$2"
    if [ $? -eq 0 ]; then
        return 0
    fi

-    rm -f "$2"
    return 1
 }

@@ -57,7 +54,6 @@ md5sum_tool()
 download()
 {
    n=0; while [ -n "${url[$n]}" ]; do
-
        u="${url[$n]}"
        s="${md5[$n]}"
        file=$(basename "$u")
@@ -71,22 +67,11 @@ download()
            fi
        fi

-	# First try LSTS mirror.
-	lsts_url="http://lsts.pt/glued/$(basename $u)"
-        download_tool "$lsts_url" "$cfg_dir_downloads/$file"
-        if [ $? -ne 0 ]; then
-	    # Then try OceanScan-MST mirror.
-            omst_url="http://www.omst.pt/glued/$(basename $u)"
-            download_tool "$omst_url" "$cfg_dir_downloads/$file"
-            if [ $? -ne 0 ]; then
-		# On failure try upstream URL.
        download_tool "$u" "$cfg_dir_downloads/$file"
        if [ $? -ne 0 ]; then
            echo "ERROR: download failed"
            exit 1
        fi
-            fi
-	fi

        md5="$(md5sum_tool "$cfg_dir_downloads/$file")"
        if [ "$s" != "$md5" ]; then
@@ -110,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"
@@ -138,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."
@@ -152,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
@@ -194,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
@@ -244,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.
@@ -311,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

@@ -331,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.
@@ -360,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
--- a/mksystem.bash
+++ b/mksystem.bash
@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2017 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                                                 #
-###########################################################################

 # Check shell type.
 if [ -z "$BASH_VERSION" ]; then
--- a/packages/alsa-lib/default.bash
+++ b/packages/alsa-lib/default.bash
--- a/packages/alsa-utils/default.bash
+++ b/packages/alsa-utils/default.bash
--- a/packages/apache-ant/host.bash
+++ b/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=\
--- a/packages/apache-log4cxx/default.bash
+++ b/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
--- a/packages/apache-log4cxx/patches-0.10.0/00-patches-gcc4.7-console.cpp.patch
+++ b/packages/apache-log4cxx/patches-0.10.0/00-patches-gcc4.7-console.cpp.patch
--- a/packages/apache-log4cxx/patches-0.10.0/00-patches-gcc4.7-inputstreamreader.cpp.patch
+++ b/packages/apache-log4cxx/patches-0.10.0/00-patches-gcc4.7-inputstreamreader.cpp.patch
--- a/packages/apache-log4cxx/patches-0.10.0/00-patches-gcc4.7-socketoutputstream.cpp.patch
+++ b/packages/apache-log4cxx/patches-0.10.0/00-patches-gcc4.7-socketoutputstream.cpp.patch
--- a/packages/apr-util/default.bash
+++ b/packages/apr-util/default.bash
@@ -1,16 +1,16 @@
 version=\
 (
-    '1.5.3'
+    '1.5.2'
 )

 url=\
 (
-    "http://archive.apache.org/dist/apr/apr-util-$version.tar.bz2"
+    "http://www.eu.apache.org/dist/apr/apr-util-$version.tar.bz2"
 )

 md5=\
 (
-    '6f3417691c7a27090f36e7cf4d94b36e'
+    '89c1348aa79e898d7c34a6206311c9c2'
 )

 maintainer=\
--- a/packages/apr-util/ros.bash
+++ b/packages/apr-util/ros.bash
@@ -5,7 +5,7 @@ version=\

 url=\
 (
-    "http://archive.apache.org/dist/apr/apr-util-$version.tar.bz2"
+    "http://www.eu.apache.org/dist/apr/apr-util-$version.tar.bz2"
 )

 md5=\
--- a/packages/apr/default.bash
+++ b/packages/apr/default.bash
@@ -1,16 +1,16 @@
 version=\
 (
-    '1.5.1'
+    '1.4.6'
 )

 url=\
 (
-    "http://archive.apache.org/dist/apr/apr-$version.tar.bz2"
+    "http://www.eu.apache.org/dist/apr/apr-$version.tar.bz2"
 )

 md5=\
 (
-    '5486180ec5a23efb5cae6d4292b300ab'
+    'ffee70a111fd07372982b0550bbb14b7'
 )

 maintainer=\
--- a/packages/apr/ros.bash
+++ b/packages/apr/ros.bash
@@ -5,7 +5,7 @@ version=\

 url=\
 (
-    "http://archive.apache.org/dist/apr/apr-$version.tar.bz2"
+    "http://mirror.nohup.it/apache/apr/apr-$version.tar.bz2"
 )

 md5=\
@@ -15,6 +15,7 @@ md5=\

 # @todo patch.

+
 configure()
 {
  cd apr-${version}
--- a/packages/atk/default.bash
+++ b/packages/atk/default.bash
--- a/packages/autoconf/host.bash
+++ b/packages/autoconf/host.bash
--- a/packages/automake/host.bash
+++ b/packages/automake/host.bash
--- a/packages/base/common.bash
+++ b/packages/base/common.bash
--- a/packages/base/cross.bash
+++ b/packages/base/cross.bash
@@ -1,8 +1,9 @@
-source $pkg_common
+source $PKG_COMMON

 requires=\
 (
    'base/host'
    'gcc/cross'
+    'eglibc/locales'
    'gdb/cross'
 )
--- a/packages/base/default.bash
+++ b/packages/base/default.bash
@@ -1,9 +1,8 @@
-source $pkg_common
+source $PKG_COMMON

 requires=\
 (
    'base/host'
    'base/cross'
-    'iana-etc/default'
    'filesystem/target'
 )
--- a/packages/base/host.bash
+++ b/packages/base/host.bash
@@ -25,5 +25,4 @@ requires=\
    'texinfo/host'
    'parted/host'
    'dosfstools/host'
-    'e2fsprogs/host'
 )
--- a/packages/binutils/cross.bash
+++ b/packages/binutils/cross.bash
@@ -0,0 +1,48 @@
+version=\
+(
+    "2.22"
+)
+
+url=\
+(
+    "http://mirrors.kernel.org/gnu/binutils/binutils-$version.tar.bz2"
+)
+
+md5=\
+(
+    "ee0f10756c84979622b992a4a61ea3f5"
+)
+
+maintainer=\
+(
+    "Ricardo Martins <rasm@fe.up.pt>"
+)
+
+build_dir=$PKG_VAR
+
+configure()
+{
+    ../binutils-$version/configure $extra_flags \
+        --prefix=$cfg_dir_toolchain \
+        --target=${cfg_target_canonical} \
+        --host=${cfg_host_canonical} \
+        --build=${cfg_host_canonical} \
+        --with-sysroot=$cfg_dir_toolchain_sysroot \
+        --with-mpfr=${cfg_dir_toolchain} \
+        --with-gmp=${cfg_dir_toolchain} \
+        --with-mpc=${cfg_dir_toolchain} \
+        --disable-nls \
+        --disable-werror \
+        --disable-multilib
+}
+
+build()
+{
+    $cmd_make
+}
+
+host_install()
+{
+    $cmd_make install
+    rm -rf $cfg_dir_toolchain/{info,man}
+}
--- a/packages/bison/host.bash
+++ b/packages/bison/host.bash
--- a/packages/boost/default.bash
+++ b/packages/boost/default.bash
@@ -1,6 +1,6 @@
 version=\
 (
-    "1.55.0"
+    "1.53.0"
 )

 vendor_version="$(echo $version | tr . _)"
@@ -17,7 +17,7 @@ maintainer=\

 md5=\
 (
-    "d6eef4b4cacb2183f2bf265a5a03a354"
+    "a00d22605d5dbcfb4c9936a9b35bc4c2"
 )

 requires=\
@@ -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
--- a/packages/boost/patches-1.47.0/00-issue-with-thread.patch
+++ b/packages/boost/patches-1.47.0/00-issue-with-thread.patch
@@ -0,0 +1,11 @@
+--- boost_1_47_0/boost/config/stdlib/libstdcpp3.hpp	2011-04-25 14:10:48.000000000 +0200
+++ boost_1_47_0/boost/config/stdlib/libstdcpp3.hpp	2013-04-08 16:26:05.222543782 +0200
+@@ -33,7 +33,7 @@
+ 
+ #ifdef __GLIBCXX__ // gcc 3.4 and greater:
+ #  if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \
+-        || defined(_GLIBCXX__PTHREADS)
+        || defined(_GLIBCXX__PTHREADS) || defined(_GLIBCXX_HAS_GTHREADS)
+       //
+       // If the std lib has thread support turned on, then turn it on in Boost
+       // as well.  We do this because some gcc-3.4 std lib headers define _REENTANT
--- a/packages/bridge-utils/default.bash
+++ b/packages/bridge-utils/default.bash
@@ -1,31 +1,26 @@
 version=\
 (
-    '1.6'
+    "1.4"
 )

 url=\
 (
-    "http://www.kernel.org/pub/linux/utils/net/bridge-utils/bridge-utils-$version.tar.gz"
+    "http://downloads.sourceforge.net/project/bridge/bridge/bridge-utils-$version/bridge-utils-$version.tar.gz"
 )

 md5=\
 (
-    'f369e90e85e4bb46baa26a7b9d66b578'
+    "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()
--- a/packages/busybox/config
+++ b/packages/busybox/config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.24.1
-# Tue Apr  5 18:00:54 2016
+# Busybox version: 1.20.2
+# Tue May 14 09:03:37 2013
 #
 CONFIG_HAVE_DOT_CONFIG=y

@@ -36,15 +36,12 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
 # CONFIG_UNICODE_BIDI_SUPPORT is not set
 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
 # CONFIG_UNICODE_PRESERVE_BROKEN is not set
-# CONFIG_PAM is not set
-CONFIG_FEATURE_USE_SENDFILE=y
 CONFIG_LONG_OPTS=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
 # CONFIG_FEATURE_UTMP is not set
 # CONFIG_FEATURE_WTMP is not set
 # CONFIG_FEATURE_PIDFILE is not set
-CONFIG_PID_FILE_PATH=""
 CONFIG_FEATURE_SUID=y
 # CONFIG_FEATURE_SUID_CONFIG is not set
 # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
@@ -75,7 +72,6 @@ CONFIG_EXTRA_LDLIBS=""
 #
 # CONFIG_DEBUG is not set
 # CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_UNIT_TEST is not set
 # CONFIG_WERROR is not set
 CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
@@ -100,7 +96,6 @@ CONFIG_PREFIX="./_install"
 CONFIG_FEATURE_RTMINMAX=y
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=1
-CONFIG_SHA3_SMALL=1
 CONFIG_FEATURE_FAST_TOP=y
 # CONFIG_FEATURE_ETC_NETWORKS is not set
 CONFIG_FEATURE_USE_TERMIOS=y
@@ -138,14 +133,7 @@ CONFIG_FEATURE_SEAMLESS_BZ2=y
 # CONFIG_AR is not set
 # CONFIG_FEATURE_AR_LONG_FILENAMES is not set
 # CONFIG_FEATURE_AR_CREATE is not set
-# CONFIG_UNCOMPRESS is not set
-CONFIG_GUNZIP=y
 CONFIG_BUNZIP2=y
-# CONFIG_UNLZMA is not set
-# CONFIG_FEATURE_LZMA_FAST is not set
-# CONFIG_LZMA is not set
-CONFIG_UNXZ=y
-CONFIG_XZ=y
 # CONFIG_BZIP2 is not set
 # CONFIG_CPIO is not set
 # CONFIG_FEATURE_CPIO_O is not set
@@ -153,10 +141,10 @@ CONFIG_XZ=y
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
 # CONFIG_GZIP is not set
 # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
 CONFIG_GZIP_FAST=0
-# CONFIG_FEATURE_GZIP_LEVELS is not set
 # CONFIG_LZOP is not set
 # CONFIG_LZOP_COMPR_HIGH is not set
 # CONFIG_RPM2CPIO is not set
@@ -173,6 +161,12 @@ CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
 # CONFIG_FEATURE_TAR_UNAME_GNAME is not set
 # CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
 # CONFIG_FEATURE_TAR_SELINUX is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+# CONFIG_LZMA is not set
+CONFIG_UNXZ=y
+CONFIG_XZ=y
 # CONFIG_UNZIP is not set

 #
@@ -184,27 +178,16 @@ CONFIG_DATE=y
 CONFIG_FEATURE_DATE_ISOFMT=y
 # CONFIG_FEATURE_DATE_NANO is not set
 CONFIG_FEATURE_DATE_COMPAT=y
-CONFIG_DD=y
-CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
-# CONFIG_FEATURE_DD_IBS_OBS is not set
-CONFIG_FEATURE_DD_STATUS=y
 # CONFIG_HOSTID is not set
 CONFIG_ID=y
 CONFIG_GROUPS=y
-CONFIG_SHUF=y
-CONFIG_SYNC=y
-CONFIG_FEATURE_SYNC_FANCY=y
 CONFIG_TEST=y
 # CONFIG_FEATURE_TEST_64 is not set
 CONFIG_TOUCH=y
-CONFIG_FEATURE_TOUCH_NODEREF=y
 CONFIG_FEATURE_TOUCH_SUSV3=y
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
-CONFIG_TRUNCATE=y
-CONFIG_UNLINK=y
 CONFIG_BASE64=y
 # CONFIG_WHO is not set
 # CONFIG_USERS is not set
@@ -220,6 +203,10 @@ CONFIG_CHROOT=y
 CONFIG_CP=y
 # CONFIG_FEATURE_CP_LONG_OPTIONS is not set
 CONFIG_CUT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
+# CONFIG_FEATURE_DD_IBS_OBS is not set
 CONFIG_DF=y
 # CONFIG_FEATURE_DF_FANCY is not set
 CONFIG_DIRNAME=y
@@ -276,7 +263,6 @@ CONFIG_SEQ=y
 # CONFIG_SHA1SUM is not set
 # CONFIG_SHA256SUM is not set
 # CONFIG_SHA512SUM is not set
-CONFIG_SHA3SUM=y
 CONFIG_SLEEP=y
 # CONFIG_FEATURE_FANCY_SLEEP is not set
 # CONFIG_FEATURE_FLOAT_SLEEP is not set
@@ -284,10 +270,11 @@ CONFIG_SORT=y
 # CONFIG_FEATURE_SORT_BIG is not set
 # CONFIG_SPLIT is not set
 # CONFIG_FEATURE_SPLIT_FANCY is not set
-CONFIG_STAT=y
-CONFIG_FEATURE_STAT_FORMAT=y
+# CONFIG_STAT is not set
+# CONFIG_FEATURE_STAT_FORMAT is not set
 CONFIG_STTY=y
 # CONFIG_SUM is not set
+CONFIG_SYNC=y
 # CONFIG_TAC is not set
 CONFIG_TAIL=y
 # CONFIG_FEATURE_FANCY_TAIL is not set
@@ -296,7 +283,6 @@ CONFIG_TEE=y
 CONFIG_TRUE=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
-CONFIG_UNAME_OSNAME="GNU/Linux"
 # CONFIG_UNEXPAND is not set
 # CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
 CONFIG_UNIQ=y
@@ -308,11 +294,6 @@ CONFIG_WC=y
 CONFIG_WHOAMI=y
 CONFIG_YES=y

-#
-# Common options
-#
-CONFIG_FEATURE_VERBOSE=y
-
 #
 # Common options for cp and mv
 #
@@ -329,7 +310,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
 CONFIG_FEATURE_HUMAN_READABLE=y

 #
-# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
+# Common options for md5sum, sha1sum, sha256sum, sha512sum
 #
 # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set

@@ -375,16 +356,7 @@ CONFIG_WHICH=y
 #
 # Editors
 #
-CONFIG_AWK=y
-# CONFIG_FEATURE_AWK_LIBM is not set
-CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
-CONFIG_CMP=y
-# CONFIG_DIFF is not set
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-# CONFIG_FEATURE_DIFF_DIR is not set
-# CONFIG_ED is not set
 # CONFIG_PATCH is not set
-CONFIG_SED=y
 CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=4096
 CONFIG_FEATURE_VI_8BIT=y
@@ -399,9 +371,15 @@ CONFIG_FEATURE_VI_USE_SIGNALS=y
 # CONFIG_FEATURE_VI_SET is not set
 CONFIG_FEATURE_VI_WIN_RESIZE=y
 CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_UNDO=y
-CONFIG_FEATURE_VI_UNDO_QUEUE=y
-CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
+# CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set
+CONFIG_AWK=y
+# CONFIG_FEATURE_AWK_LIBM is not set
+CONFIG_CMP=y
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_ED is not set
+CONFIG_SED=y
 CONFIG_FEATURE_ALLOW_EXEC=y

 #
@@ -418,7 +396,6 @@ CONFIG_FEATURE_FIND_MAXDEPTH=y
 # CONFIG_FEATURE_FIND_NEWER is not set
 # CONFIG_FEATURE_FIND_INUM is not set
 CONFIG_FEATURE_FIND_EXEC=y
-CONFIG_FEATURE_FIND_EXEC_PLUS=y
 CONFIG_FEATURE_FIND_USER=y
 CONFIG_FEATURE_FIND_GROUP=y
 CONFIG_FEATURE_FIND_NOT=y
@@ -440,7 +417,6 @@ CONFIG_XARGS=y
 CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
 # CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
 CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
-CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y

 #
 # Init Utilities
@@ -477,7 +453,6 @@ CONFIG_USE_BB_CRYPT=y
 CONFIG_ADDUSER=y
 # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
 # CONFIG_FEATURE_CHECK_NAMES is not set
-CONFIG_LAST_ID=60000
 CONFIG_FIRST_SYSTEM_ID=100
 CONFIG_LAST_SYSTEM_ID=999
 CONFIG_ADDGROUP=y
@@ -489,6 +464,7 @@ CONFIG_DELGROUP=y
 CONFIG_GETTY=y
 CONFIG_LOGIN=y
 # CONFIG_LOGIN_SESSION_AS_CHILD is not set
+# CONFIG_PAM is not set
 # CONFIG_LOGIN_SCRIPTS is not set
 CONFIG_FEATURE_NOLOGIN=y
 # CONFIG_FEATURE_SECURETTY is not set
@@ -546,26 +522,13 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 # Linux System Utilities
 #
 CONFIG_BLOCKDEV=y
-CONFIG_FATATTR=y
-CONFIG_FSTRIM=y
 CONFIG_MDEV=y
 CONFIG_FEATURE_MDEV_CONF=y
 CONFIG_FEATURE_MDEV_RENAME=y
 CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
 CONFIG_FEATURE_MDEV_EXEC=y
 CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
-CONFIG_MOUNT=y
-# CONFIG_FEATURE_MOUNT_FAKE is not set
-# CONFIG_FEATURE_MOUNT_VERBOSE is not set
-# CONFIG_FEATURE_MOUNT_HELPERS is not set
-CONFIG_FEATURE_MOUNT_LABEL=y
-# CONFIG_FEATURE_MOUNT_NFS is not set
-# CONFIG_FEATURE_MOUNT_CIFS is not set
-CONFIG_FEATURE_MOUNT_FLAGS=y
-CONFIG_FEATURE_MOUNT_FSTAB=y
-CONFIG_FEATURE_MOUNT_OTHERTAB=y
 CONFIG_REV=y
-CONFIG_UEVENT=y
 # CONFIG_ACPID is not set
 # CONFIG_FEATURE_ACPID_COMPAT is not set
 CONFIG_BLKID=y
@@ -611,6 +574,15 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
 # CONFIG_MKSWAP is not set
 # CONFIG_FEATURE_MKSWAP_UUID is not set
 CONFIG_MORE=y
+CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_FAKE is not set
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
+CONFIG_FEATURE_MOUNT_LABEL=y
+# CONFIG_FEATURE_MOUNT_NFS is not set
+# CONFIG_FEATURE_MOUNT_CIFS is not set
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
 CONFIG_PIVOT_ROOT=y
 # CONFIG_RDATE is not set
 # CONFIG_RDEV is not set
@@ -620,9 +592,8 @@ CONFIG_PIVOT_ROOT=y
 # CONFIG_SCRIPTREPLAY is not set
 # CONFIG_SETARCH is not set
 # CONFIG_SWAPONOFF is not set
-# CONFIG_FEATURE_SWAPON_DISCARD is not set
 # CONFIG_FEATURE_SWAPON_PRI is not set
-CONFIG_SWITCH_ROOT=y
+# CONFIG_SWITCH_ROOT is not set
 CONFIG_UMOUNT=y
 CONFIG_FEATURE_UMOUNT_ALL=y

@@ -637,45 +608,32 @@ CONFIG_VOLUMEID=y
 #
 # Filesystem/Volume identification
 #
-# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-CONFIG_FEATURE_VOLUMEID_EXFAT=y
 CONFIG_FEATURE_VOLUMEID_EXT=y
-CONFIG_FEATURE_VOLUMEID_F2FS=y
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
 CONFIG_FEATURE_VOLUMEID_FAT=y
 # CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
 # CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-CONFIG_FEATURE_VOLUMEID_NILFS=y
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
 # CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set

 #
 # Miscellaneous Utilities
 #
 # CONFIG_CONSPY is not set
-# CONFIG_CROND is not set
-# CONFIG_FEATURE_CROND_D is not set
-# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-CONFIG_FEATURE_CROND_DIR=""
-CONFIG_I2CGET=y
-CONFIG_I2CSET=y
-CONFIG_I2CDUMP=y
-CONFIG_I2CDETECT=y
 CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=9999999
 CONFIG_FEATURE_LESS_BRACKETS=y
 CONFIG_FEATURE_LESS_FLAGS=y
-CONFIG_FEATURE_LESS_TRUNCATE=y
 # CONFIG_FEATURE_LESS_MARKS is not set
 # CONFIG_FEATURE_LESS_REGEXP is not set
 # CONFIG_FEATURE_LESS_WINCH is not set
@@ -684,17 +642,13 @@ CONFIG_FEATURE_LESS_TRUNCATE=y
 # CONFIG_FEATURE_LESS_LINENUMS is not set
 # CONFIG_NANDWRITE is not set
 # CONFIG_NANDDUMP is not set
-# CONFIG_RFKILL is not set
 CONFIG_SETSERIAL=y
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
 CONFIG_UBIMKVOL=y
 CONFIG_UBIRMVOL=y
 CONFIG_UBIRSVOL=y
 CONFIG_UBIUPDATEVOL=y
-# CONFIG_WALL is not set
 # CONFIG_ADJTIMEX is not set
 # CONFIG_BBCONFIG is not set
 # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
@@ -710,6 +664,10 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0
 # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
 # CONFIG_FEATURE_CHAT_CLR_ABORT is not set
 # CONFIG_CHRT is not set
+# CONFIG_CROND is not set
+# CONFIG_FEATURE_CROND_D is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_FEATURE_CROND_DIR=""
 # CONFIG_CRONTAB is not set
 # CONFIG_DC is not set
 # CONFIG_FEATURE_DC_LIBM is not set
@@ -725,7 +683,7 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0
 CONFIG_FLASHCP=y
 CONFIG_FLASH_LOCK=y
 CONFIG_FLASH_UNLOCK=y
-CONFIG_FLASH_ERASEALL=y
+# CONFIG_FLASH_ERASEALL is not set
 # CONFIG_IONICE is not set
 # CONFIG_INOTIFYD is not set
 # CONFIG_LAST is not set
@@ -747,14 +705,18 @@ CONFIG_MOUNTPOINT=y
 # CONFIG_MT is not set
 # CONFIG_RAIDAUTORUN is not set
 # CONFIG_READAHEAD is not set
+# CONFIG_RFKILL is not set
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
 # CONFIG_SETSID is not set
 # CONFIG_STRINGS is not set
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
 CONFIG_TIME=y
 # CONFIG_TIMEOUT is not set
 # CONFIG_TTYSIZE is not set
 # CONFIG_VOLNAME is not set
+# CONFIG_WALL is not set
 CONFIG_WATCHDOG=y

 #
@@ -770,13 +732,6 @@ CONFIG_NC_EXTRA=y
 CONFIG_PING=y
 # CONFIG_PING6 is not set
 CONFIG_FEATURE_FANCY_PING=y
-CONFIG_WGET=y
-# CONFIG_FEATURE_WGET_STATUSBAR is not set
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
-CONFIG_FEATURE_WGET_TIMEOUT=y
-CONFIG_FEATURE_WGET_OPENSSL=y
-CONFIG_FEATURE_WGET_SSL_HELPER=y
 CONFIG_WHOIS=y
 # CONFIG_FEATURE_IPV6 is not set
 # CONFIG_FEATURE_UNIX_LOCAL is not set
@@ -793,13 +748,13 @@ CONFIG_ETHER_WAKE=y
 CONFIG_FTPD=y
 CONFIG_FEATURE_FTP_WRITE=y
 CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
-CONFIG_FEATURE_FTP_AUTHENTICATION=y
 # CONFIG_FTPGET is not set
 # CONFIG_FTPPUT is not set
 # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
 CONFIG_HOSTNAME=y
 # CONFIG_HTTPD is not set
 # CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
 # CONFIG_FEATURE_HTTPD_SETUID is not set
 # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
 # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
@@ -838,7 +793,6 @@ CONFIG_IP=y
 CONFIG_FEATURE_IP_ADDRESS=y
 CONFIG_FEATURE_IP_LINK=y
 CONFIG_FEATURE_IP_ROUTE=y
-CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2"
 # CONFIG_FEATURE_IP_TUNNEL is not set
 # CONFIG_FEATURE_IP_RULE is not set
 # CONFIG_FEATURE_IP_SHORT_FORMS is not set
@@ -857,7 +811,6 @@ CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2"
 # CONFIG_NSLOOKUP is not set
 # CONFIG_NTPD is not set
 # CONFIG_FEATURE_NTPD_SERVER is not set
-# CONFIG_FEATURE_NTPD_CONF is not set
 # CONFIG_PSCAN is not set
 CONFIG_ROUTE=y
 # CONFIG_SLATTACH is not set
@@ -891,7 +844,6 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y
 CONFIG_DHCPD_LEASES_FILE=""
 CONFIG_UDHCPC=y
 # CONFIG_FEATURE_UDHCPC_ARPING is not set
-CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=9
 CONFIG_FEATURE_UDHCP_RFC3397=y
@@ -901,6 +853,11 @@ CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
 # CONFIG_UDPSVD is not set
 # CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+# CONFIG_FEATURE_WGET_STATUSBAR is not set
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
+CONFIG_FEATURE_WGET_TIMEOUT=y
 # CONFIG_ZCIP is not set

 #
@@ -933,13 +890,6 @@ CONFIG_POWERTOP=y
 CONFIG_PSTREE=y
 CONFIG_PWDX=y
 CONFIG_SMEMCAP=y
-CONFIG_TOP=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
-# CONFIG_FEATURE_TOP_SMP_CPU is not set
-# CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-CONFIG_FEATURE_TOPMEM=y
 CONFIG_UPTIME=y
 # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
 CONFIG_FREE=y
@@ -960,6 +910,13 @@ CONFIG_FEATURE_PS_LONG=y
 # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
 CONFIG_RENICE=y
 # CONFIG_BB_SYSCTL is not set
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+# CONFIG_FEATURE_TOP_SMP_CPU is not set
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+CONFIG_FEATURE_TOPMEM=y
 # CONFIG_FEATURE_SHOW_THREADS is not set
 # CONFIG_WATCH is not set

@@ -1005,7 +962,6 @@ CONFIG_ASH_GETOPTS=y
 # CONFIG_ASH_BUILTIN_ECHO is not set
 CONFIG_ASH_BUILTIN_PRINTF=y
 CONFIG_ASH_BUILTIN_TEST=y
-CONFIG_ASH_HELP=y
 # CONFIG_ASH_CMDCMD is not set
 # CONFIG_ASH_MAIL is not set
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
@@ -1055,11 +1011,6 @@ CONFIG_FEATURE_IPC_SYSLOG=y
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
 CONFIG_LOGREAD=y
 CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
-CONFIG_FEATURE_KMSG_SYSLOG=y
 CONFIG_KLOGD=y
-
-#
-# klogd should not be used together with syslog to kernel printk buffer
-#
 CONFIG_FEATURE_KLOGD_KLOGCTL=y
 CONFIG_LOGGER=y
--- a/packages/busybox/default.bash
+++ b/packages/busybox/default.bash
@@ -1,6 +1,6 @@
 version=\
 (
-    '1.24.1'
+    "1.20.2"
 )

 url=\
@@ -10,12 +10,12 @@ url=\

 md5=\
 (
-    'be98a40cadf84ce2d6b05fa41a275c6a'
+    "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 -
 }
--- a/packages/busybox/fs/etc/inetd.conf
+++ b/packages/busybox/fs/etc/inetd.conf
--- a/packages/bzip2/common.bash
+++ b/packages/bzip2/common.bash
--- a/packages/bzip2/default.bash
+++ b/packages/bzip2/default.bash
@@ -1,4 +1,4 @@
-source $pkg_common
+source $PKG_COMMON


 configure()
--- a/packages/bzip2/host.bash
+++ b/packages/bzip2/host.bash
@@ -1,4 +1,4 @@
-source $pkg_common
+source $PKG_COMMON

 build()
 {
--- a/packages/cairo/default.bash
+++ b/packages/cairo/default.bash
--- a/packages/cdk/default.bash
+++ b/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
+}
--- a/packages/cmake/host.bash
+++ b/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
 }
--- a/packages/collectd/default.bash
+++ b/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
--- a/packages/collectd/fs/etc/rc.d/collectd
+++ b/packages/collectd/fs/etc/rc.d/collectd
--- a/packages/crypto++/default.bash
+++ b/packages/crypto++/default.bash
--- a/packages/curl/default.bash
+++ b/packages/curl/default.bash
--- a/packages/db/default.bash
+++ b/packages/db/default.bash
@@ -1,16 +1,16 @@
 version=\
 (
-    '4.8.30'
+    "4.8.26"
 )

 url=\
 (
-    "http://download.oracle.com/berkeley-db/db-$version.tar.gz"
+    "ftp://mirror.ovh.net/gentoo-distfiles/distfiles/db-$version.tar.gz"
 )

 md5=\
 (
-    'f80022099c5742cd179343556179aa8c'
+    "3476bac9ec0f3c40729c8a404151d5e3"
 )

 configure()
--- a/packages/desert/default.bash
+++ b/packages/desert/default.bash
@@ -0,0 +1,79 @@
+version=\
+(
+    '1.0'
+)
+
+ns_version=\
+(
+    '2.34'
+)
+
+url=\
+(
+    "http://www.lsts.pt/glued/desert-$version.tar.gz"
+)
+
+md5=\
+(
+    '5b83d1d6e5390a44f1dc0c5a3794581c'
+)
+
+requires=\
+(
+    'ns-miracle/default'
+)
+
+post_unpack()
+{
+    patches=$(ls "$cfg_package_spec_dir/patches/"*.patch)
+    if [ -n "$patches" ]; then
+        cat $patches | patch -p0
+    fi
+}
+
+configure()
+{
+    find . -name "*.o" -exec rm {} \;
+    /usr/bin/aclocal -I m4 --force && /usr/bin/libtoolize --force && /usr/bin/automake --foreign --add-missing && /usr/bin/autoconf
+
+    prefix="/DESERT_lib"
+
+    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"                       \
+                --with-ns-allinone=${cfg_dir_builds}/ns/            \
+                --with-nsmiracle=${cfg_dir_builds}/ns-miracle/ns-miracle-1.0/trunk/main/      \
+                --prefix="$prefix"
+
+}
+
+build()
+{
+    $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()
+{
+    $cmd_mkdir \
+    "$cfg_dir_toolchain_sysroot/ns2/DESERT_lib/lib" &&
+
+    $cmd_make \
+        DESTDIR="$cfg_dir_toolchain_sysroot/ns2/" \
+        install
+
+}
+
+target_install()
+{
+    cp -r "${cfg_dir_toolchain_sysroot}/ns2/DESERT_lib/lib" "${cfg_dir_rootfs}/usr/ns2/DESERT/"
+
+    for f in "$cfg_dir_toolchain_sysroot/ns2/DESERT_lib/lib/"lib*.so.0.0.0; do
+        $cmd_target_strip "$f" -o ${cfg_dir_rootfs}/usr/ns2/DESERT/"$(basename "$f")"
+    done
+
+}
--- a/packages/desert/patches/000-lib.patch
+++ b/packages/desert/patches/000-lib.patch
@@ -0,0 +1,19 @@
+--- ./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)
--- a/packages/desert/patches/001-lib.patch
+++ b/packages/desert/patches/001-lib.patch
@@ -0,0 +1,11 @@
+--- configure.ac	2012-09-27 11:57:58.190424449 +0200
+++ configure.ac	2012-09-27 12:03:02.599357310 +0200
+@@ -42,6 +42,8 @@
+ DESERT_CPPFLAGS="$DESERT_CPPFLAGS "'-I$(top_srcdir)/mobility/uwdriftposition'
+ DESERT_CPPFLAGS="$DESERT_CPPFLAGS "'-I$(top_srcdir)/mobility/uwgmposition'
+ 
+TCL2CPP="qemu-arm -L ${cfg_dir_rootfs} ${cfg_dir_rootfs}/lib/ld-linux.so.3 ${cfg_dir_toolchain_sysroot}/usr/bin/tcl2c++"
+
+ AC_SUBST(DESERT_CPPFLAGS) 
+ 
+ AC_SUBST(DESERT_LDFLAGS) 
--- a/packages/dnsmasq/default.bash
+++ b/packages/dnsmasq/default.bash
@@ -26,6 +26,5 @@ build()

 target_install()
 {
-    $cmd_target_strip src/dnsmasq -o "$cfg_dir_rootfs/usr/sbin/dnsmasq" &&
-    tar -C "$pkg_dir/fs" -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+    $cmd_target_strip src/dnsmasq -o "$cfg_dir_rootfs/usr/sbin/dnsmasq"
 }
--- a/packages/dosfstools/host.bash
+++ b/packages/dosfstools/host.bash
@@ -0,0 +1,33 @@
+version=\
+(
+    '3.0.20'
+)
+
+url=\
+(
+    "http://daniel-baumann.ch/files/software/dosfstools/dosfstools-$version.tar.gz"
+)
+
+md5=\
+(
+    '7f1c1afd4ae4622e07b24ec0ddfc4184'
+)
+
+maintainer=\
+(
+    'Ricardo Martins <rasm@fe.up.pt>'
+)
+
+build()
+{
+    CC="$cmd_host_cc" \
+        $cmd_make \
+        PREFIX="$cfg_dir_toolchain"
+}
+
+host_install()
+{
+    CC="$cmd_host_cc" \
+        $cmd_make \
+        PREFIX="$cfg_dir_toolchain" install
+}
--- a/packages/dropbear/default.bash
+++ b/packages/dropbear/default.bash
@@ -1,6 +1,6 @@
 version=\
 (
-    '2015.67'
+    '2012.55'
 )

 url=\
@@ -10,7 +10,7 @@ url=\

 md5=\
 (
-    'e967e320344cd4bfebe321e3ab8514d6'
+    '8c784baec3054cdb1bb4bfa792c87812'
 )

 maintainer=\
@@ -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
@@ -43,7 +43,7 @@ configure()
        --target="$cfg_target_canonical" \
        --host="$cfg_target_canonical" \
        --build="$cfg_host_canonical" \
-        --with-zlib="$cfg_dir_toolchain_sysroot/usr"
+        --with-zlib="$cfg_dir_toolchain"
 }

 build()
@@ -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 -
 }
--- a/packages/dropbear/fs/etc/rc.d/dropbear
+++ b/packages/dropbear/fs/etc/rc.d/dropbear
--- a/packages/dropbear/patches/000-cryptlib-link.patch
+++ b/packages/dropbear/patches/000-cryptlib-link.patch
@@ -0,0 +1,30 @@
+diff --git a/Makefile.in b/Makefile.in
+index cec35f1..46a9365 100644
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h packet.h algo.h ssh.h buffer.h kex.h \
+ 		loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
+ 		listener.h fake-rfc2553.h
+ 
+-dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ 
+dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) 
+ dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS)
+ dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
+ dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS)
+@@ -169,14 +169,14 @@ scp: $(SCPOBJS)  $(HEADERS) Makefile
+ # multi-binary compilation.
+ MULTIOBJS=
+ ifeq ($(MULTI),1)
+-	MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ 
+	MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) 
+ 	CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI
+ endif
+ 
+ dropbearmulti: multilink 
+ 
+ multibinary: $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile
+-	$(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS)
+	$(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS) @CRYPTLIB@
+ 
+ multilink: multibinary $(addprefix link, $(PROGRAMS))
+ 
--- a/packages/dtn/default.bash
+++ b/packages/dtn/default.bash
@@ -0,0 +1,80 @@
+version=\
+(
+    '2.9.0'
+)
+
+url=\
+(
+    "http://downloads.sourceforge.net/dtn/dtn-$version.tgz"
+)
+
+md5=\
+(
+    'adfc25b561c1eeda30d9b68a6b088bd8'
+)
+
+maintainer=\
+(
+    'Ricardo Martins <rasm@fe.up.pt>'
+)
+
+requires=\
+(
+    'db/default'
+    'tcl/default'
+    'xerces-c/default'
+    'oasys/default'
+)
+
+configure()
+{
+    "../dtn-$version/configure" \
+        --prefix="/usr" \
+        --sysconfdir="/etc/dtn" \
+        --target="$cfg_target_canonical" \
+        --host="$cfg_target_canonical" \
+        --build="$cfg_host_canonical" \
+        --with-oasys="$cfg_dir_toolchain_sysroot/usr" \
+        --enable-ecl \
+        --without-python \
+        --disable-python
+}
+
+build()
+{
+    $cmd_make -j1 -C servlib &&
+    $cmd_make -j1 -C applib libdtnapi.a &&
+    $cmd_make -j1 -C applib libdtnapi++.a &&
+    $cmd_make -j1 -C applib libdtnapisrv.a &&
+    $cmd_make -j1 -C daemon &&
+    $cmd_make -j1 -C apps
+}
+
+host_install()
+{
+    cp -a servlib/libdtnserv.a "$cfg_dir_toolchain_sysroot/usr/lib" &&
+    cp -a applib/libdtnapi++.a "$cfg_dir_toolchain_sysroot/usr/lib" &&
+    cp -a applib/libdtnapi++-$version.a "$cfg_dir_toolchain_sysroot/usr/lib" &&
+    cp -a applib/libdtnapi-$version.a "$cfg_dir_toolchain_sysroot/usr/lib" &&
+    cp -a applib/libdtnapi.a "$cfg_dir_toolchain_sysroot/usr/lib" &&
+    cp -a applib/libdtnapisrv.a "$cfg_dir_toolchain_sysroot/usr/lib" &&
+
+    mkdir -p "$cfg_dir_toolchain_sysroot/usr/include/dtn" &&
+    cp -a applib/dtn_ipc.h "$cfg_dir_toolchain_sysroot/usr/include/dtn" &&
+    cp -a applib/dtn_errno.h "$cfg_dir_toolchain_sysroot/usr/include/dtn" &&
+    cp -a applib/sdnv-c.h "$cfg_dir_toolchain_sysroot/usr/include/dtn" &&
+    cp -a applib/dtn_api.h "$cfg_dir_toolchain_sysroot/usr/include/dtn" &&
+    cp -a applib/dtn_types.h "$cfg_dir_toolchain_sysroot/usr/include/dtn"
+}
+
+target_install()
+{
+    $cmd_target_strip apps/dtnsend/dtnsend -o "$cfg_dir_rootfs/usr/bin/dtnsend" &&
+    $cmd_target_strip apps/dtnrecv/dtnrecv -o "$cfg_dir_rootfs/usr/bin/dtnrecv" &&
+    $cmd_target_strip apps/dtncp/dtncp -o "$cfg_dir_rootfs/usr/bin/dtncp" &&
+    $cmd_target_strip apps/dtnping/dtnping -o "$cfg_dir_rootfs/usr/bin/dtnping" &&
+    $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 "$cfg_package_spec_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
+}
--- a/packages/dtn/fs/etc/rc.d/dtnd
+++ b/packages/dtn/fs/etc/rc.d/dtnd
@@ -0,0 +1,29 @@
+# Configuration parameters
+# cfg_dtnd_config: DTN Daemon configuration file.
+# cfg_dtnd_name: DTN node name.
+
+start()
+{
+    export DTN_NODE="$cfg_dtnd_name"
+    db="/opt/lsts/dtn/var/$DTN_NODE/db"
+
+    if [ -f "$cfg_dtnd_config" ]; then
+        mkdir -p /opt/lsts/dtn
+
+        if ! [ -d "$db" ]; then
+            mkdir -p "$db"
+            /usr/bin/dtnd \
+                -c "$cfg_dtnd_config" \
+                --init-db
+        fi
+
+        /usr/bin/dtnd -d \
+            -c "$cfg_dtnd_config" \
+            -o /opt/lsts/dtn/log.txt
+    fi
+}
+
+stop()
+{
+    killall dtnd > /dev/null 2>&1
+}
--- a/packages/e2fsprogs/default.bash
+++ b/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" \
@@ -20,13 +31,7 @@ build()

 target_install()
 {
-    $cmd_target_strip --strip-unneeded ../e2fsprogs-$version/e2fsck/e2fsck -o "$cfg_dir_rootfs/sbin/e2fsck" &&
-    $cmd_target_strip --strip-unneeded ../e2fsprogs-$version/misc/mke2fs -o "$cfg_dir_rootfs/sbin/mke2fs" &&
-    $cmd_target_strip --strip-unneeded ../e2fsprogs-$version/misc/tune2fs -o "$cfg_dir_rootfs/sbin/tune2fs" &&
-    ln -fs e2fsck "$cfg_dir_rootfs/sbin/fsck.ext2" &&
-    ln -fs e2fsck "$cfg_dir_rootfs/sbin/fsck.ext3" &&
-    ln -fs e2fsck "$cfg_dir_rootfs/sbin/fsck.ext4" &&
-    ln -fs mke2fs "$cfg_dir_rootfs/sbin/mkfs.ext2" &&
-    ln -fs mke2fs "$cfg_dir_rootfs/sbin/mkfs.ext3" &&
-    ln -fs mke2fs "$cfg_dir_rootfs/sbin/mkfs.ext4"
+    $cmd_target_strip --strip-unneeded ../e2fsprogs-$version/e2fsck/e2fsck -o $cfg_dir_rootfs/sbin/e2fsck &&
+    $cmd_target_strip --strip-unneeded ../e2fsprogs-$version/misc/mke2fs -o $cfg_dir_rootfs/sbin/mke2fs &&
+    $cmd_target_strip --strip-unneeded ../e2fsprogs-$version/misc/tune2fs -o $cfg_dir_rootfs/sbin/tune2fs
 }
--- a/packages/eglibc/common.bash
+++ b/packages/eglibc/common.bash
@@ -1,16 +1,16 @@
 version=\
 (
-    '2.24'
+    '2.15.17955'
 )

 url=\
 (
-    "http://ftp.gnu.org/pub/gnu/glibc/glibc-$version.tar.xz"
+    "http://www.lsts.pt/glued/eglibc-$version.tar.bz2"
 )

 md5=\
 (
-    '97dc5517f92016f3d70d83e3162ad318'
+    '0694f304863e3c97562857388137a83e'
 )

 maintainer=\
@@ -18,13 +18,15 @@ maintainer=\
    'Ricardo Martins <rasm@fe.up.pt>'
 )

-build_dir=$pkg_var
+build_dir=$PKG_VAR

 post_unpack()
 {
-    patches=$(ls "$pkg_dir"/patches/*.patch)
+    ln -fs ../ports ../eglibc-$version/libc/ports

-    cd ../glibc-$version
+    patches=$(ls "$cfg_package_spec_dir"/patches/*.patch)
+
+    cd ../eglibc-$version
    if [ -n "$patches" ]; then
        cat $patches | patch -p1
    fi
@@ -39,24 +41,17 @@ configure()
        CC="$cfg_dir_toolchain/bin/$cfg_target_canonical-gcc" \
        CXX="$cfg_dir_toolchain/bin/$cfg_target_canonical-g++" \
        CFLAGS=$cfg_target_gcc_flags \
-        "../glibc-$version/configure" \
-        $cfg_target_glibc_configure_flags \
+        "../eglibc-$version/libc/configure" \
+        $cfg_target_eglibc_configure_flags \
        --prefix=/usr \
        --with-headers="$cfg_dir_toolchain_sysroot/usr/include" \
-        --with-build-sysroot="$cfg_dir_toolchain_sysroot" \
-        --with-sysroot="$cfg_dir_toolchain_sysroot" \
        --build="$cfg_host_canonical" \
        --host="$cfg_target_canonical" \
-        --disable-multilib \
        --disable-profile \
        --without-gd \
        --without-cvs \
        --enable-add-ons \
        --with-tls \
        --enable-kernel=2.6.32 \
-        --disable-nls \
-        --enable-static-nss \
-        --disable-werror \
-        --enable-obsolete-rpc \
-        --enable-bind-now
+        --disable-nls
 }
--- a/packages/eglibc/cross.bash
+++ b/packages/eglibc/cross.bash
@@ -1,4 +1,4 @@
-source $pkg_common
+source $PKG_COMMON

 requires=\
 (
@@ -7,12 +7,13 @@ requires=\

 build()
 {
-    $cmd_make
+    $cmd_make -j1
 }

 host_install()
 {
-    $cmd_make install_root="$cfg_dir_toolchain_sysroot" install
+    $cmd_make install_root="$cfg_dir_toolchain_sysroot" -j1 install &&
+    cp "$cfg_package_spec_dir"/files/timepps.h "$cfg_dir_toolchain_sysroot/usr/include"
 }

 target_install()
@@ -32,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 -
 }
--- a/packages/eglibc/files/timepps.h
+++ b/packages/eglibc/files/timepps.h
@@ -0,0 +1,199 @@
+/*
+ * timepps.h -- PPS API main header
+ *
+ * Copyright (C) 2005-2007   Rodolfo Giometti <giometti@linux.it>
+ *
+ *   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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _SYS_TIMEPPS_H_
+#define _SYS_TIMEPPS_H_
+
+#include <unistd.h>
+#include <errno.h>
+#include <sys/time.h>
+#include <sys/ioctl.h>
+#include <linux/types.h>
+#include <linux/pps.h>
+
+#define LINUXPPS	1		/* signal we are using LinuxPPS */
+
+/*
+ * New data structures
+ */
+
+struct ntp_fp {
+	unsigned int integral;
+	unsigned int fractional;
+};
+
+union pps_timeu {
+	struct timespec tspec;
+	struct ntp_fp ntpfp;
+	unsigned long longpad[3];
+};
+
+struct pps_info {
+	unsigned long assert_sequence;	/* seq. num. of assert event */
+	unsigned long clear_sequence;	/* seq. num. of clear event */
+	union pps_timeu assert_tu;	/* time of assert event */
+	union pps_timeu clear_tu;	/* time of clear event */
+	int current_mode;		/* current mode bits */
+};
+
+struct pps_params {
+	int api_version;		/* API version # */
+	int mode;			/* mode bits */
+	union pps_timeu assert_off_tu;	/* offset compensation for assert */
+	union pps_timeu clear_off_tu;	/* offset compensation for clear */
+};
+
+typedef int pps_handle_t;		/* represents a PPS source */
+typedef unsigned long pps_seq_t;	/* sequence number */
+typedef struct ntp_fp ntp_fp_t;		/* NTP-compatible time stamp */
+typedef union pps_timeu pps_timeu_t;	/* generic data type for time stamps */
+typedef struct pps_info pps_info_t;
+typedef struct pps_params pps_params_t;
+
+#define assert_timestamp        assert_tu.tspec
+#define clear_timestamp         clear_tu.tspec
+
+#define assert_timestamp_ntpfp  assert_tu.ntpfp
+#define clear_timestamp_ntpfp   clear_tu.ntpfp
+
+#define assert_offset		assert_off_tu.tspec
+#define clear_offset		clear_off_tu.tspec
+
+#define assert_offset_ntpfp     assert_off_tu.ntpfp
+#define clear_offset_ntpfp      clear_off_tu.ntpfp
+
+/*
+ * The PPS API
+ */
+
+static __inline int time_pps_create(int source, pps_handle_t *handle)
+{
+	int ret;
+	struct pps_kparams dummy;
+
+	if (!handle) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	/* First we check if current device is a valid PPS one by
+	 * doing a dummy PPS_GETPARAMS...
+	 */
+	ret = ioctl(source, PPS_GETPARAMS, &dummy);
+	if (ret) {
+		errno = EOPNOTSUPP;
+		return -1;
+	}
+
+	/* ... then since in LinuxPPS there are no differences between a
+	 * "PPS source" and a "PPS handle", we simply return the same value.
+	 */
+	*handle = source;
+
+	return 0;
+}
+
+static __inline int time_pps_destroy(pps_handle_t handle)
+{
+	return close(handle);
+}
+
+static __inline int time_pps_getparams(pps_handle_t handle,
+					pps_params_t *ppsparams)
+{
+	int ret;
+	struct pps_kparams __ppsparams;
+
+	ret = ioctl(handle, PPS_GETPARAMS, &__ppsparams);
+
+	ppsparams->api_version = __ppsparams.api_version;
+	ppsparams->mode = __ppsparams.mode;
+	ppsparams->assert_off_tu.tspec.tv_sec = __ppsparams.assert_off_tu.sec;
+	ppsparams->assert_off_tu.tspec.tv_nsec = __ppsparams.assert_off_tu.nsec;
+	ppsparams->clear_off_tu.tspec.tv_sec = __ppsparams.clear_off_tu.sec;
+	ppsparams->clear_off_tu.tspec.tv_nsec = __ppsparams.clear_off_tu.nsec;
+
+	return ret;
+}
+
+static __inline int time_pps_setparams(pps_handle_t handle,
+					const pps_params_t *ppsparams)
+{
+	struct pps_kparams __ppsparams;
+
+	__ppsparams.api_version = ppsparams->api_version;
+	__ppsparams.mode = ppsparams->mode;
+	__ppsparams.assert_off_tu.sec = ppsparams->assert_off_tu.tspec.tv_sec;
+	__ppsparams.assert_off_tu.nsec = ppsparams->assert_off_tu.tspec.tv_nsec;
+	__ppsparams.clear_off_tu.sec = ppsparams->clear_off_tu.tspec.tv_sec;
+	__ppsparams.clear_off_tu.nsec = ppsparams->clear_off_tu.tspec.tv_nsec;
+
+	return ioctl(handle, PPS_SETPARAMS, &__ppsparams);
+}
+
+/* Get capabilities for handle */
+static __inline int time_pps_getcap(pps_handle_t handle, int *mode)
+{
+	return ioctl(handle, PPS_GETCAP, mode);
+}
+
+static __inline int time_pps_fetch(pps_handle_t handle, const int tsformat,
+					pps_info_t *ppsinfobuf,
+					const struct timespec *timeout)
+{
+	struct pps_fdata __fdata;
+	int ret;
+
+	/* Sanity checks */
+	if (tsformat != PPS_TSFMT_TSPEC) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (timeout) {
+		__fdata.timeout.sec = timeout->tv_sec;
+		__fdata.timeout.nsec = timeout->tv_nsec;
+		__fdata.timeout.flags = ~PPS_TIME_INVALID;
+	} else
+		__fdata.timeout.flags = PPS_TIME_INVALID;
+
+	ret = ioctl(handle, PPS_FETCH, &__fdata);
+
+	ppsinfobuf->assert_sequence = __fdata.info.assert_sequence;
+	ppsinfobuf->clear_sequence = __fdata.info.clear_sequence;
+	ppsinfobuf->assert_tu.tspec.tv_sec = __fdata.info.assert_tu.sec;
+	ppsinfobuf->assert_tu.tspec.tv_nsec = __fdata.info.assert_tu.nsec;
+	ppsinfobuf->clear_tu.tspec.tv_sec = __fdata.info.clear_tu.sec;
+	ppsinfobuf->clear_tu.tspec.tv_nsec = __fdata.info.clear_tu.nsec;
+	ppsinfobuf->current_mode = __fdata.info.current_mode;
+
+	return ret;
+}
+
+static __inline int time_pps_kcbind(pps_handle_t handle,
+					const int kernel_consumer,
+					const int edge, const int tsformat)
+{
+	/* LinuxPPS doesn't implement kernel consumer feature */
+	errno = EOPNOTSUPP;
+	return -1;
+}
+
+#endif				/* _SYS_TIMEPPS_H_ */
--- a/packages/eglibc/fs/etc/hosts
+++ b/packages/eglibc/fs/etc/hosts
--- a/packages/eglibc/fs/etc/ld.so.conf
+++ b/packages/eglibc/fs/etc/ld.so.conf
--- a/packages/eglibc/fs/etc/nsswitch.conf
+++ b/packages/eglibc/fs/etc/nsswitch.conf
--- a/packages/eglibc/headers.bash
+++ b/packages/eglibc/headers.bash
@@ -1,4 +1,4 @@
-source $pkg_common
+source $PKG_COMMON

 requires=\
 (
@@ -21,6 +21,4 @@ EOF
    $cmd_make csu/subdir_lib &&
    cp csu/crt1.o csu/crti.o csu/crtn.o "$cfg_dir_toolchain_sysroot/usr/lib" &&
    $cmd_target_cc -nostdlib -nostartfiles -shared -x c /dev/null -o "$cfg_dir_toolchain_sysroot/usr/lib/libc.so"
-    $cmd_mkdir "$cfg_dir_toolchain_sysroot/usr/include/gnu" &&
-    touch "$cfg_dir_toolchain_sysroot/usr/include/gnu/stubs.h"
 }
--- a/packages/eglibc/locales.bash
+++ b/packages/eglibc/locales.bash
@@ -0,0 +1,39 @@
+source $PKG_COMMON
+
+requires=\
+(
+    'eglibc/cross'
+)
+
+configure()
+{
+    "../eglibc-$version/localedef/configure" \
+        --prefix="$cfg_dir_toolchain_sysroot/usr" \
+        --with-glibc=."./eglibc-$version/libc"
+}
+
+build()
+{
+    $cmd_make
+}
+
+host_install()
+{
+    $cmd_mkdir "$cfg_dir_toolchain_sysroot/usr/lib/locale" &&
+    if [ -f "$cfg_dir_toolchain_sysroot/usr/share/i18n/charmaps/UTF-8.gz" ]; then
+        gunzip -f "$cfg_dir_toolchain_sysroot/usr/share/i18n/charmaps/UTF-8.gz"
+    fi &&
+    if [ -f "$cfg_dir_toolchain_sysroot/usr/share/i18n/charmaps/ISO-8859-1.gz" ]; then
+        gunzip -f "$cfg_dir_toolchain_sysroot/usr/share/i18n/charmaps/ISO-8859-1.gz"
+    fi &&
+
+    ./localedef -v -c -i pt_PT -f UTF-8 pt_PT
+    ./localedef -v -c -i ru_RU -f UTF-8 ru_RU
+    true
+}
+
+target_install()
+{
+    $cmd_mkdir "$cfg_dir_rootfs/usr/lib/locale" &&
+    cp -v "$cfg_dir_toolchain_sysroot/usr/lib/locale/locale-archive" "$cfg_dir_rootfs/usr/lib/locale"
+}
--- a/packages/eglibc/patches/000-reexport-rpc-interface.patch
+++ b/packages/eglibc/patches/000-reexport-rpc-interface.patch
@@ -0,0 +1,24 @@
+diff -Nru eglibc-2.15-16611/libc/include/libc-symbols.h eglibc-2.15-16611-rasm/libc/include/libc-symbols.h
+--- eglibc-2.15-16611/libc/include/libc-symbols.h	2012-01-09 21:16:30.000000000 +0000
+++ eglibc-2.15-16611-rasm/libc/include/libc-symbols.h	2012-01-10 23:37:36.863616530 +0000
+@@ -647,7 +647,7 @@
+ # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
+ # define libc_hidden_def(name) hidden_def (name)
+ # define libc_hidden_weak(name) hidden_weak (name)
+-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
+# define libc_hidden_nolink(name, version) hidden_def (name)
+ # define libc_hidden_ver(local, name) hidden_ver (local, name)
+ # define libc_hidden_data_def(name) hidden_data_def (name)
+ # define libc_hidden_data_weak(name) hidden_data_weak (name)
+diff -Nru eglibc-2.15-16611/libc/sunrpc/Makefile eglibc-2.15-16611-rasm/libc/sunrpc/Makefile
+--- eglibc-2.15-16611/libc/sunrpc/Makefile	2012-01-09 21:16:30.000000000 +0000
+++ eglibc-2.15-16611-rasm/libc/sunrpc/Makefile	2012-01-10 23:38:14.574076188 +0000
+@@ -55,7 +55,7 @@
+ 				    des_crypt.h)
+ headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
+ 		       $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
+-headers = rpc/netdb.h
+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
+ generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
+ 	    $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
+ generated-dirs := rpcsvc
--- a/packages/eglibc/patches/001-reinstall-nis-rpc-headers.patch
+++ b/packages/eglibc/patches/001-reinstall-nis-rpc-headers.patch
@@ -0,0 +1,15 @@
+diff -Nru eglibc-2.15-16611/libc/nis/Makefile eglibc-2.15-16611-rasm/libc/nis/Makefile
+--- eglibc-2.15-16611/libc/nis/Makefile	2012-01-09 21:16:30.000000000 +0000
+++ eglibc-2.15-16611-rasm/libc/nis/Makefile	2012-01-10 23:40:26.409018009 +0000
+@@ -25,9 +25,9 @@
+ 
+ aux			:= nis_hash
+ 
+headers			:= $(wildcard rpcsvc/*.[hx])
+ distribute		:= nss-nis.h nss-nisplus.h nis_intern.h Banner \
+-			   nisplus-parser.h nis_xdr.h nss \
+-			   $(wildcard rpcsvc/*.[hx])
+			   nisplus-parser.h nis_xdr.h nss 
+ 
+ # These are the databases available for the nis (and perhaps later nisplus)
+ # service.  This must be a superset of the services in nss.
--- a/packages/eglibc/patches/002-dl-close-fix.patch
+++ b/packages/eglibc/patches/002-dl-close-fix.patch
@@ -0,0 +1,107 @@
+diff -Nru eglibc-2.15.17955/libc/elf/dl-close.c eglibc-2.15.17955.rasm/libc/elf/dl-close.c
+--- eglibc-2.15.17955/libc/elf/dl-close.c	2012-04-07 20:58:55.000000000 +0100
+++ eglibc-2.15.17955.rasm/libc/elf/dl-close.c	2012-10-23 22:33:33.351846745 +0100
+@@ -119,17 +119,8 @@
+   if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
+       || dl_close_state != not_pending)
+     {
+-      if (map->l_direct_opencount == 0)
+-	{
+-	  if (map->l_type == lt_loaded)
+-	    dl_close_state = rerun;
+-	  else if (map->l_type == lt_library)
+-	    {
+-	      struct link_map **oldp = map->l_initfini;
+-	      map->l_initfini = map->l_orig_initfini;
+-	      _dl_scope_free (oldp);
+-	    }
+-	}
+      if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
+        dl_close_state = rerun;
+ 
+       /* There are still references to this object.  Do nothing more.  */
+       if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0))
+diff -Nru eglibc-2.15.17955/libc/elf/dl-deps.c eglibc-2.15.17955.rasm/libc/elf/dl-deps.c
+--- eglibc-2.15.17955/libc/elf/dl-deps.c	2012-04-07 20:58:55.000000000 +0100
+++ eglibc-2.15.17955.rasm/libc/elf/dl-deps.c	2012-10-23 22:38:17.124208092 +0100
+@@ -689,6 +689,7 @@
+   l_initfini[nlist] = NULL;
+   atomic_write_barrier ();
+   map->l_initfini = l_initfini;
+  map->l_free_initfini = 1;
+   if (l_reldeps != NULL)
+     {
+       atomic_write_barrier ();
+@@ -697,7 +698,7 @@
+       _dl_scope_free (old_l_reldeps);
+     }
+   if (old_l_initfini != NULL)
+-      map->l_orig_initfini = old_l_initfini;
+    _dl_scope_free (old_l_initfini);
+ 
+   if (errno_reason)
+     _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
+diff -Nru eglibc-2.15.17955/libc/elf/dl-libc.c eglibc-2.15.17955.rasm/libc/elf/dl-libc.c
+--- eglibc-2.15.17955/libc/elf/dl-libc.c	2012-04-07 20:58:55.000000000 +0100
+++ eglibc-2.15.17955.rasm/libc/elf/dl-libc.c	2012-10-23 22:39:02.388449874 +0100
+@@ -270,13 +270,13 @@
+ 
+   for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
+     {
+-      /* Remove all additional names added to the objects.  */
+       for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
+ 	{
+ 	  struct libname_list *lnp = l->l_libname->next;
+ 
+ 	  l->l_libname->next = NULL;
+ 
+          /* Remove all additional names added to the objects.  */
+ 	  while (lnp != NULL)
+ 	    {
+ 	      struct libname_list *old = lnp;
+@@ -284,6 +284,10 @@
+ 	      if (! old->dont_free)
+ 		free (old);
+ 	    }
+
+          /* Free the initfini dependency list.  */
+          if (l->l_free_initfini)
+            free (l->l_initfini);
+ 	}
+ 
+       if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
+diff -Nru eglibc-2.15.17955/libc/elf/rtld.c eglibc-2.15.17955.rasm/libc/elf/rtld.c
+--- eglibc-2.15.17955/libc/elf/rtld.c	2012-04-07 20:58:55.000000000 +0100
+++ eglibc-2.15.17955.rasm/libc/elf/rtld.c	2012-10-23 22:39:30.692348894 +0100
+@@ -2277,6 +2277,8 @@
+ 	      lnp->dont_free = 1;
+ 	      lnp = lnp->next;
+ 	    }
+          /* Also allocated with the fake malloc().  */
+          l->l_free_initfini = 0;
+ 
+ 	  if (l != &GL(dl_rtld_map))
+ 	    _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
+diff -Nru eglibc-2.15.17955/libc/include/link.h eglibc-2.15.17955.rasm/libc/include/link.h
+--- eglibc-2.15.17955/libc/include/link.h	2012-04-07 20:58:55.000000000 +0100
+++ eglibc-2.15.17955.rasm/libc/include/link.h	2012-10-23 22:40:31.526900046 +0100
+@@ -192,6 +192,9 @@
+ 						 during LD_TRACE_PRELINKING=1
+ 						 contains any DT_SYMBOLIC
+ 						 libraries.  */
+    unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
+                                       freed, ie. not allocated with
+                                       the dummy malloc in ld.so.  */
+ 
+     /* Collected information about own RPATH directories.  */
+     struct r_search_path_struct l_rpath_dirs;
+@@ -240,9 +243,6 @@
+ 
+     /* List of object in order of the init and fini calls.  */
+     struct link_map **l_initfini;
+-    /* The init and fini list generated at startup, saved when the
+-       object is also loaded dynamically.  */
+-    struct link_map **l_orig_initfini;
+ 
+     /* List of the dependencies introduced through symbol binding.  */
+     struct link_map_reldeps
--- a/packages/eglibc/patches/003-make382-install_root.patch
+++ b/packages/eglibc/patches/003-make382-install_root.patch
@@ -0,0 +1,12 @@
+diff -Naur eglibc-2.15-16526.orig/config.make.in eglibc-2.15-16526/config.make.in
+--- eglibc-2.15-16526.orig/libc/config.make.in	2012-07-24 17:49:58.000000000 -0400
+++ eglibc-2.15-16526/libc/config.make.in	2012-07-24 17:51:01.000000000 -0400
+@@ -5,7 +5,7 @@
+ release = @RELEASE@
+
+ # Installation prefixes.
+-install_root = $(DESTDIR)
+install_root ?= $(DESTDIR)
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
--- a/packages/escc/default.bash
+++ b/packages/escc/default.bash
@@ -1,6 +1,6 @@
 version=\
 (
-    '1.0.71'
+    '1.0.3'
 )

 url=\
@@ -10,7 +10,7 @@ url=\

 md5=\
 (
-    '075c9256fe20cf6ce867dc2b1c974ebe'
+    'd8729636cc2d7f46f62141d392898bfa'
 )

 if [ -d "$cfg_dir_builds/linux/linux-"* ]; then
@@ -25,7 +25,7 @@ build()
        M=`pwd` \
        -C "$kernel" &&

-    for util in setescc esccclock esccsettings esccfs6131; do
+    for util in setescc esccclock esccsettings; 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 esccfs6131; do
+    for util in setescc esccclock esccsettings; 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 -
 }
--- a/packages/escc/fs/etc/escc/hg1700-psimar.sh
+++ b/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
--- a/packages/escc/fs/etc/escc/hg1700.cfg
+++ b/packages/escc/fs/etc/escc/hg1700.cfg
--- a/packages/escc/fs/etc/escc/hg1700.sh
+++ b/packages/escc/fs/etc/escc/hg1700.sh
@@ -0,0 +1,3 @@
+/usr/bin/setescc 0 0x200 5 0 0 0
+/usr/bin/esccclock 0 0x5d1460 23
+/usr/bin/esccsettings 0 /etc/escc/hg1700.cfg
--- a/packages/escc/fs/etc/escc/ifog-imu-1-a.cfg
+++ b/packages/escc/fs/etc/escc/ifog-imu-1-a.cfg
--- a/packages/escc/fs/etc/escc/ifog-imu-1-a.sh
+++ b/packages/escc/fs/etc/escc/ifog-imu-1-a.sh
@@ -1,14 +1,8 @@
-# Channels:
-# * 0: iMAR iFOG-IMU-1-A
-# * 1: LSTS PSIMAR
-
-# Create channels.
+# IMU
 /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
+
+# PSIMAR
+/usr/bin/setescc 1 0x200 5 0 0 1
 /usr/bin/esccsettings 1 /etc/escc/psimar.cfg
+/usr/bin/esccclock 1 0xc8920 22
--- a/packages/escc/fs/etc/escc/psimar.cfg
+++ b/packages/escc/fs/etc/escc/psimar.cfg
--- a/packages/escc/fs/etc/rc.d/escc
+++ b/packages/escc/fs/etc/rc.d/escc
@@ -5,14 +5,6 @@ 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
--- a/packages/europa/compat/ar
+++ b/packages/europa/compat/ar
--- a/packages/europa/compat/c++
+++ b/packages/europa/compat/c++
--- a/packages/europa/compat/cc
+++ b/packages/europa/compat/cc
--- a/packages/europa/compat/g++
+++ b/packages/europa/compat/g++
--- a/packages/europa/compat/gcc
+++ b/packages/europa/compat/gcc
--- a/packages/europa/compat/ranlib
+++ b/packages/europa/compat/ranlib
--- a/packages/europa/default.bash
+++ b/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"

--- a/packages/europa/patches-2.6-6693/001-no-swig.patch
+++ b/packages/europa/patches-2.6-6693/001-no-swig.patch
--- a/packages/expat/default.bash
+++ b/packages/expat/default.bash
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jose Braga	c2c0689b70	Marking version 1.9.4.	2014-01-28 10:49:04 +00:00
Jose Braga	b0112ec61c	escc: script to configure hg1700 plus psimar.	2014-01-28 10:39:11 +00:00
Jose Braga	e6e9a01c1d	Marking version 1.9.3.	2014-01-27 18:00:38 +00:00
Jose Braga	23e5f9b34c	Renamed sc-1 aux.	2014-01-27 17:57:08 +00:00
Jose Braga	5abb3e220a	Marking version 1.9.1.	2014-01-27 17:48:37 +00:00
Jose Braga	9686a1cefa	Renamed lauv-seacon-4.	2014-01-27 17:47:38 +00:00