Index: tools/autotool.py
===================================================================
--- tools/autotool.py	(revision db3089df1b73fd8c776071a2bef307f5226bdf9b)
+++ tools/autotool.py	(revision c9e09f26171e31413438891ef35603df24ce8ac7)
@@ -615,4 +615,5 @@
 				path = "%s/%s/bin" % (cross_prefix, platform)
 		
+		common['TARGET'] = target
 		prefix = "%s-" % target
 		
Index: tools/hsct.sh
===================================================================
--- tools/hsct.sh	(revision c9e09f26171e31413438891ef35603df24ce8ac7)
+++ tools/hsct.sh	(revision c9e09f26171e31413438891ef35603df24ce8ac7)
@@ -0,0 +1,399 @@
+#!/bin/sh
+
+#
+# Copyright (c) 2013-2017 Vojtech Horky
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+# - The name of the author may not be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# Calling harbour functions:
+#    These functions are always called in a subshell to "guard" them a little
+# bit (variables set by the harbour, cd into package directory).
+# 
+# Notice on usage of set -o errexit (set -e) 
+#    We want to use that option for the harbour scripts to get rid of the
+# "|| return 1" at the end of each line.
+#    Obvious solution is to wrap the call like this:
+#       (  set -o errexit; build ) || { hsct_error "..."; return 1; }
+#    This doesn't work because the whole subshell is then part of a ||
+# operand and thus the set -e is ignored (even if it is a subshell).
+# See https://groups.google.com/d/msg/gnu.bash.bug/NCK_0GmIv2M/y6RQF1AWUQkJ
+#    Thus, we need to use the following template to get past this:
+#       ( set -o errexit; build; exit $? );
+#       [ $? -eq 0 ] || { hsct_error "..."; return 1; }
+#
+# Also notice that we never ever call exit from the top-most shell when
+# leaving after an error. That is to prevent terminating user shell when
+# this script is sourced ("env" command). It complicates the error handling
+# a bit but it is more reliable than trying to guess whether we are running
+# in a subshell or not.
+#
+
+# Necessary because this script is called from a Makefile.
+# The parent Makefile's options would otherwise pollute the build environment.
+# TODO: It would be helpful to extract the -j option out of this.
+unset MAKEFLAGS
+unset GNUMAKEFLAGS
+
+# Print short help.
+# Does not exit the whole script.
+hsct_usage() {
+	echo "Usage:"
+	echo " $1 action [package]"
+	echo "    Action can be one of following:"
+	echo "       clean     Clean built directory."
+	echo "       fetch     Fetch sources (e.g. download from homepage)."
+	echo "       build     Build given package."
+	echo "       package   Save installable files to allow cleaning."
+	echo "       install   Install to uspace/dist of HelenOS."
+	echo "       archive   Create tarball instead of installing."
+	echo " $1 help"
+	echo "    Display this help and exit."
+}
+
+# Print high-level information message.
+hsct_info() {
+	echo ">>>" "$@" >&2
+}
+
+# Print lower-level information message (additional info after hsct_info).
+hsct_info2() {
+	echo "     ->" "$@" >&2
+}
+
+# Print information message from HARBOUR script.
+msg() {
+	hsct_info "$@"
+}
+
+# Print high-level error message.
+hsct_error() {
+	echo "[hsct]:" "Error:" "$@" >&2
+}
+
+# Print additional details to the error message.
+hsct_error2() {
+	echo "[hsct]:" "  ->  " "$@" >&2
+}
+
+# Run a command but print it first.
+hsct_run_echo() {
+	echo -n "[hsct]: "
+	for ___i in "$@"; do
+		echo -n "$___i" | sed -e 's#"#\\"#g' -e 's#.*#"&" #'
+	done
+	echo
+	"$@"
+}
+
+# Run comman from HARBOUR script and print it as well.
+run() {
+	hsct_run_echo "$@"
+}
+
+hsct_process_harbour_opts() {
+	HSCT_OPTS_NO_DEPENDENCY_BUILDING=false
+	HSCT_OPTS_NO_FILE_DOWNLOADING=false
+	HSCT_HARBOUR_NAME=""
+	
+	while echo "$1" | grep -q '^--'; do
+		case "$1" in
+			--no-deps)
+				HSCT_OPTS_NO_DEPENDENCY_BUILDING=true
+				;;
+			--no-fetch)
+				HSCT_OPTS_NO_FILE_DOWNLOADING=true
+				;;
+			*)
+				hsct_error "Unknown option $1."
+				return 1
+				;;
+		esac
+		shift
+	done
+	
+	HSCT_HARBOUR_NAME="$1"
+	
+	return 0
+}
+
+# Fetch all the specified files in the HARBOUR
+hsct_fetch() {
+	mkdir -p "$HSCT_SOURCES_DIR"
+	hsct_info "Fetching sources..."
+	for _url in $shipsources; do
+		_filename=`basename "$_url"`
+		if [ "$_filename" = "$_url" ]; then
+			continue
+		fi
+		if ! [ -r "$HSCT_SOURCES_DIR/$_filename" ]; then
+			if $HSCT_OPTS_NO_FILE_DOWNLOADING; then
+				hsct_error "File $_filename missing, cannot continue."
+				hsct_error2 "Build without --no-fetch."
+				return 1
+			fi
+			
+			hsct_info2 "Fetching $_filename..."
+			# Remove the file even on Ctrl-C when fetching
+			trap "rm -f \"$HSCT_SOURCES_DIR/$_filename\"; echo" SIGINT SIGQUIT
+			if ! wget $HSCT_WGET_OPTS "$_url" -O "$HSCT_SOURCES_DIR/$_filename"; then
+				rm -f "$HSCT_SOURCES_DIR/$_filename"
+				hsct_error "Failed to fetch $_url."
+				return 1
+			fi
+			trap - SIGINT SIGQUIT
+		fi
+		# TODO - check MD5
+	done
+	return 0
+}
+
+hsct_prepare_env() {
+	if [ "$shipfunnels" -gt "$HSCT_PARALLELISM" ] 2>/dev/null; then
+		shipfunnels="$HSCT_PARALLELISM"
+	elif [ "$shipfunnels" -le "$HSCT_PARALLELISM" ] 2>/dev/null; then
+		if [ "$shipfunnels" -le "0" ]; then
+			shipfunnels="$HSCT_PARALLELISM"
+		fi
+	else
+		shipfunnels="1"
+	fi
+}
+
+# Remove the build directory of given package.
+hsct_clean() {
+	hsct_info "Cleaning build directory..."
+	rm -rf "$HSCT_BUILD_DIR/$shipname/"*
+}
+
+# Build the package.
+hsct_build() {
+	mkdir -p "$HSCT_BUILD_DIR/$shipname"
+	if [ -e "$HSCT_BUILD_DIR/${shipname}.built" ]; then
+		hsct_info "No need to build $shipname."
+		return 0
+	fi
+	
+	# Check for prerequisities
+	for tug in $shiptugs; do
+		if ! [ -e "$HSCT_BUILD_DIR/${tug}.packaged" ]; then
+			if $HSCT_OPTS_NO_DEPENDENCY_BUILDING; then
+				hsct_error "Dependency $tug not built, cannot continue."
+				hsct_error2 "Build $tug first or run without --no-deps."
+				return 1
+			fi
+			hsct_info "Need to build $tug first."
+			hsct_info2 "Running $HSCT_HSCT package $tug"
+			(
+				$HSCT_HSCT package $tug
+				exit $?
+			)
+			if [ $? -ne 0 ]; then
+				hsct_error "Failed to package dependency $tug."
+				hsct_error2 "Cannot continue building $shipname."
+				return 1
+			fi
+			hsct_info2 "Back from building $tug."
+		fi
+	done
+	
+	hsct_prepare_env || return 1
+	
+	hsct_fetch || return 1
+	
+	for _url in $shipsources; do
+		_filename=`basename "$_url"`
+		if [ "$_filename" = "$_url" ]; then
+			_origin="$HSCT_HOME/$shipname/$_filename" 
+		else
+			_origin="$HSCT_SOURCES_DIR/$_filename"
+		fi
+		ln -sf "$_origin" "$HSCT_BUILD_DIR/$shipname/$_filename"
+	done
+	
+	(
+		cd "$HSCT_BUILD_DIR/$shipname/"
+		hsct_info "Building..."
+		set -o errexit
+		build
+		exit $?
+	)
+	if [ $? -ne 0 ]; then
+		hsct_error "Build failed!"
+		return 1
+	fi
+	touch "$HSCT_BUILD_DIR/${shipname}.built"
+	return 0
+}
+
+# Pseudo-installation - copy from build directory to "my" directory, copy libraries
+hsct_package() {
+	mkdir -p "$HSCT_INCLUDE_DIR" || { hsct_error "Failed to create include directory."; return 1; }
+	mkdir -p "$HSCT_LIB_DIR" || { hsct_error "Failed to create library directory."; return 1; }
+	mkdir -p "$HSCT_MY_DIR" || { hsct_error "Failed to create package directory."; return 1; }
+
+	if [ -e "$HSCT_BUILD_DIR/${shipname}.packaged" ]; then
+		hsct_info "No need to package $shipname."
+		return 0;
+	fi
+	
+	hsct_build || return 1
+	
+	hsct_prepare_env || return 1
+	
+	(	
+		cd "$HSCT_BUILD_DIR/$shipname/"
+		hsct_info "Packaging..."
+		set -o errexit
+		package
+		exit $?
+	)
+	if [ $? -ne 0 ]; then
+		hsct_error "Packaging failed!"
+		return 1
+	fi
+	touch "$HSCT_BUILD_DIR/${shipname}.packaged"
+	return 0
+}
+
+# Install the package to HelenOS source tree (to uspace/overlay).
+hsct_install() {
+	hsct_package || return 1
+
+	hsct_info "Installing..."
+	if ls "$HSCT_MY_DIR"/* &>/dev/null; then
+		cp -v -r -L "$HSCT_MY_DIR"/* "$HSCT_OVERLAY" || return 1
+		hsct_info2 "Do not forget to rebuild the image."
+	else
+		hsct_info2 "Note: nothing to install."
+	fi
+	return 0
+}
+
+# Create tarball to allow redistribution of the build packages
+hsct_archive() {
+	hsct_package || return 1
+	
+	hsct_info "Creating the archive..."
+	mkdir -p "$HSCT_ARCHIVE_DIR"
+	(
+		set -o errexit
+		FORMAT="tar.xz"
+		cd "$HSCT_DIST_DIR/$shipname"
+		case "$FORMAT" in
+			tar.gz)
+				tar czf "$HSCT_ARCHIVE_DIR/$shipname.tar.gz" .
+				;;
+			tar.xz)
+				tar cJf "$HSCT_ARCHIVE_DIR/$shipname.tar.xz" .
+				;;
+			*)
+				hsct_info "Unknown archive_format $FORMAT."
+				exit 1
+				;;
+		esac
+	)
+	if [ $? -ne 0 ]; then
+		hsct_error "Archiving failed!"
+		return 1
+	fi
+	
+	return 0
+}
+
+alias leave_script_ok='return 0 2>/dev/null || exit 0'
+alias leave_script_err='return 1 2>/dev/null || exit 1'
+
+HSCT_ACTION="$1"
+
+case "$HSCT_ACTION" in
+	help|--help|-h|-?)
+		hsct_usage "$0"
+		leave_script_ok
+		;;
+	clean|fetch|build|package|install|archive)
+		shift
+		if ! hsct_process_harbour_opts "$@"; then
+			leave_script_err
+		fi
+		if [ -z "$HSCT_HARBOUR_NAME" ]; then
+			hsct_usage "$0"
+			leave_script_err
+		fi
+		;;
+	*)
+		hsct_usage "$0"
+		leave_script_err
+		;;
+esac
+
+echo "$HSCT_HOME/$HSCT_HARBOUR_NAME"
+
+if ! [ -d "$HSCT_HOME/$HSCT_HARBOUR_NAME" ]; then
+	hsct_error "Unknown package $HSCT_HARBOUR_NAME."
+	leave_script_err
+fi
+
+if ! [ -r "$HSCT_HOME/$HSCT_HARBOUR_NAME/HARBOUR" ]; then
+	hsct_error "HARBOUR file missing." >&2
+	leave_script_err
+fi
+
+HSCT_OVERLAY="$HSCT_HELENOS_ROOT/uspace/overlay"
+HSCT_MY_DIR="$HSCT_DIST_DIR/$HSCT_HARBOUR_NAME"
+
+# Source the harbour to get access to the variables and functions
+. "$HSCT_HOME/$HSCT_HARBOUR_NAME/HARBOUR"
+
+case "$HSCT_ACTION" in
+	clean)
+		hsct_clean
+		;;
+	fetch)
+		hsct_fetch
+		;;
+	build)
+		hsct_build
+		;;
+	package)
+		hsct_package
+		;;
+	install)
+		hsct_install
+		;;
+	archive)
+		hsct_archive
+		;;
+	*)
+		hsct_error "Internal error, we shall not get to this point!"
+		leave_script_err
+		;;
+esac
+
+if [ $? -eq 0 ]; then
+	leave_script_ok
+else
+	leave_script_err
+fi