set -o errtrace # Let shell functions inherit ERR trap.
set -o errexit
-# Don' t locate and remember (hash) commands as they are looked up for
-# execution (don' t remember path):
+# Don't locate and remember (hash) commands as they are looked up for
+# execution (don't remember path):
set +h
hvtrap_setup()
HVMAKE="make -j ${MAKEJOBS}"
-case "${HVL_TARGET}" in
- arm926*)
- CLFS_BUILDFLAGS="-mabi=aapcs-linux -mfloat-abi=soft"
- CLFS_TARGET="arm-linux-gnueabi"
- CLFS_ARCH=arm
- ;;
- "x86_64")
- CLFS_BUILDFLAGS="-m64"
- CLFS_TARGET="${HVL_TARGET}-unknown-linux-gnu"
- CLFS_ARCH=${HVL_TARGET}
- ;;
- "x86")
- # No special flags
- CLFS_BUILDFLAGS=""
- CLFS_TARGET="i686-unknown-linux-gnu"
- CLFS_ARCH=${HVL_TARGET}
- ;;
- m68k*)
- #CLFS_BUILDFLAGS="-mcpu=51jm"
- CLFS_BUILDFLAGS=""
- CLFS_TARGET="${HVL_TARGET}-unknown-linux-gnu"
- CLFS_ARCH=${HVL_TARGET}
- ;;
- *)
- echo "Unsupported target architecture: ${HVL_TARGET}"
- return ${EXIT_FAILURE}
- ;;
-esac
+# Load default values. They can be overriden
+# by a target-specific file
+source ../targets/default
+
+if [ -f ../targets/${HVL_TARGET} ]; then
+ source ../targets/${HVL_TARGET}
+fi
+
+CLFS_TARGET="${CLFS_ARCH}-${CLFS_OS}-${CLFS_ABI}"
CLFS_HOST="$(echo $MACHTYPE | \
sed "s/$(echo $MACHTYPE | cut -d- -f2)/cross/")"
}
# Create log directory and log file for current stage if necessary
-# This should be done automatically...
-init_log_file()
+# Arg #1: log file name
+static_init_log_file()
{
+ # Checking for correct number of arguments
+ if [ $# -ne 1 ]; then
+ echo "${FUNCNAME}(), wrong number of arguments: ${*}"
+ return 1
+ fi
+
+ local LOG_FILE_NAME=${1}
+
# Scripts directory
export SCRDIR=$(pwd)
test_presence_of_packages_directory
- export LFS_PKG_DIR="$(dirname $(pwd))/packages/${LFS_STAGE}"
- export LFS_PATCHES_DIR="${SCRDIR}/patches"
+ export LFS_PKG_BASE="$(dirname $(pwd))/packages"
+ export LFS_PKG_DIR="${LFS_PKG_BASE}/${LFS_STAGE}"
export LFS_LOG_DIR=${LFS}/var/log/hvlinux-install/${LFS_STAGE}
- export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log
+ export LFS_LOG_FILE=${LFS_LOG_DIR}/${LOG_FILE_NAME}
export LFS_TMP="${LFS}/tmp"
mkdir -p ${LFS_LOG_DIR} &&
fi
}
+# Create log directory and install log file for current stage if necessary
+init_log_file()
+{
+ static_init_log_file "install.log"
+ export LFS_PATCHES_DIR="${SCRDIR}/patches"
+}
+
+# Create log directory and update log file for current stage if necessary
+init_log_file_update()
+{
+ static_init_log_file "pkg-update.log"
+ export LFS_PATCHES_DIR="${LFS_PKG_DIR}/patches"
+}
+
# Check that we are logged in as the root user, and exit if this is not the case.
check_for_root_user()
{