HVMAKE="make -j ${MAKEJOBS}"
-case "${HVL_TARGET}" in
- arm*)
- CLFS_BUILDFLAGS="-mabi=aapcs-linux -mfloat-abi=soft"
- CLFS_TARGET="arm-linux-gnueabi"
- CLFS_ARCH=$(echo ${CLFS_TARGET} | sed -e 's/-.*//' -e 's/arm.*/arm/g')
- CLFS_ENDIAN=$(echo ${CLFS_ARCH} | sed -e 's/armeb/BIG/' -e 's/arm/LITTLE/')
- if [ "${CLFS_ENDIAN}" = "LITTLE" ]; then
- CLFS_NOT_ENDIAN="BIG"
- else
- CLFS_NOT_ENDIAN="LITTLE"
- fi
- ;;
- "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}
- ;;
- *)
- 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/")"
-export CLFS_BUILDFLAGS CLFS_TARGET CLFS_ARCH CLFS_HOST CLFS_ENDIAN CLFS_NOT_ENDIAN
+export CLFS_BUILDFLAGS CLFS_TARGET CLFS_ARCH CLFS_HOST
test_presence_of_packages_directory()
{
test_presence_of_packages_directory
export LFS_PKG_DIR="$(dirname $(pwd))/packages/${LFS_STAGE}"
+ export LFS_PATCHES_DIR="${SCRDIR}/patches"
export LFS_LOG_DIR=${LFS}/var/log/hvlinux-install/${LFS_STAGE}
export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log
export LFS_TMP="${LFS}/tmp"
# Applying patch
# First argument is the name of the patch
# Second argument is the package name
-# Third argument: optional target directory (default is $LFS_TMP)
+# Third argument is the subdirectory inside the patches directory
+# Fourth argument: optional target directory (default is $LFS_TMP)
apply_patch()
{
local PATCH_FILE=${1}
local PACKAGE=${2}
+ local PDIR=${3}
local TARGET_DIR=""
- if [ $# -eq 3 ]; then
- TARGET_DIR=${3}/${PACKAGE}
+ if [ $# -eq 4 ]; then
+ TARGET_DIR=${4}/${PACKAGE}
else
TARGET_DIR=${LFS_TMP}/${PACKAGE}
fi
return ${EXIT_FAILURE}
fi
- if [ ! -f ${LFS_PKG_DIR}/${PATCH_FILE} ]; then
+ if [ ! -f ${PDIR}/${PATCH_FILE} ]; then
echo
echo "${FUNCNAME}(): patch file '${PATCH_FILE}' not found."
return ${EXIT_FAILURE}
fi
echo "Applying patch: ${PATCH_FILE}"
- patch -Np1 -d ${TARGET_DIR} -i ${LFS_PKG_DIR}/${PATCH_FILE}
+ patch -Np1 -d ${TARGET_DIR} -i ${PDIR}/${PATCH_FILE}
}
# Applying any patch(es) found for the current package.
TARGET_DIR=${2}
fi
- # Checking if we can find at least one patch.
- if ls ${LFS_PKG_DIR}/${1}-*.patch 1> /dev/null 2>&1; then
- cd ${LFS_PKG_DIR}
- for patch in ${1}-*.patch; do
- apply_patch ${patch} ${PACKAGE} ${TARGET_DIR}
- done
- fi
+ for s in common ${HVL_TARGET}; do
+ pdir=${LFS_PATCHES_DIR}/${s}
+ if [ -d ${pdir} ]; then
+ if ls ${pdir}/${1}-*.patch 1> /dev/null 2>&1; then
+ cd ${pdir}
+ for patch in ${1}-*.patch; do
+ apply_patch ${patch} ${PACKAGE} ${pdir} ${TARGET_DIR}
+ done
+ fi
+ fi
+ done
return $?
}
for time in ${TIMES}; do
HOURS=$(( $HOURS + $(echo ${time} | sed "s!^\([0-9]*\)\..*!\1!g") ))
-
+
# The first SED command extracts the minutes (fractions of an hour).
# The second SED command removed the leading zero, if applicable.
MIN=$(( $MIN + $(echo ${time} | sed "s!.*\.\([0-9][0-9]\)!\1!g" | sed "s!^0\([0-9]\)!\1!g" ) ))
done
-
+
HOURS=$(( ${HOURS} + ( ${MIN} / 100 ) ))
MIN=$(( ${MIN} % 100 ))
-
+
echo "${HOURS}.${MIN}"
}