X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=functions%2Fmain;h=246031492ef94cac1ccb78d5b8cf55066a1b17a8;hb=f17ab848cb756cad27489bf0c2746e5ead466658;hp=b02efa85dbff321b3d5645b9ce84ff60b90031f0;hpb=c30fb25c21971a9ef055c8eb6d02be264bff1d8d;p=hvlinux.git diff --git a/functions/main b/functions/main index b02efa8..2460314 100644 --- a/functions/main +++ b/functions/main @@ -2,6 +2,10 @@ 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): +set +h + hvtrap_setup() { # Setting ERR trap does implicit `set -o errexit'. @@ -47,6 +51,17 @@ fi # Load stage number definition source ./stage.def +if [ -z "${LFS_STAGE}" ]; then + echo "LFS_STAGE is undefined (see stage.def)" + return ${EXIT_FAILURE} +fi + +if [ "x${LFS_STAGE}" != "xstage0" -a "x${LFS_STAGE}" != "xstage1" ]; then + LFS="" +fi + +CLFS=${LFS} + # Load functions source ../functions/fpkg source ../functions/lpkg @@ -75,8 +90,6 @@ TAR_OPTS="-b8" # List of default archive extensions to try DEFAULT_ARCH_EXT_LIST="tar.bz2 tar.gz tgz tar.Z tar.xz zip" -HV_FONTS_PATH="/usr/share/fonts" - DEFAULT_IPKG_SCRIPT="ipkg.def" HVMAKE="make -j ${MAKEJOBS}" @@ -85,13 +98,8 @@ 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 + CLFS_ARCH=arm + CLFS_ENDIAN=LITTLE ;; "x86_64") CLFS_BUILDFLAGS="-m64" @@ -104,6 +112,12 @@ case "${HVL_TARGET}" in 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} @@ -113,18 +127,7 @@ esac 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 - -if [ -z "${LFS_STAGE}" ]; then - echo "LFS_STAGE is undefined (see stage.def)" - return ${EXIT_FAILURE} -fi - -if [ "x${LFS_STAGE}" != "xstage0" -a "x${LFS_STAGE}" != "xstage1" ]; then - LFS="" -fi - -CLFS=${LFS} +export CLFS_BUILDFLAGS CLFS_TARGET CLFS_ARCH CLFS_HOST CLFS_ENDIAN test_presence_of_packages_directory() { @@ -144,6 +147,7 @@ init_log_file() 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" @@ -176,6 +180,19 @@ get_pkg_ver() echo ${1} | sed "s!.*-\([0-9].*\)!\1!g" } +# Extracting the version number from a complete package name using underscore as separator. +# Arg. #1: Complete package name with version (ex: ecryptfs-utils_103 will output 103) +get_pkg_ver_underscore() +{ + # Checking for correct number of arguments + if [ $# -ne 1 ]; then + echo "${FUNCNAME}(), wrong number of arguments: ${*}" + return 1 + fi + + echo ${1} | sed "s!.*_\([0-9].*\)!\1!g" +} + # Extracting the first digit version number from a complete package name. # Arg. #1: Complete package name with version (ex: gcc-3.4.4 will output 3) get_pkg_ver1() @@ -232,37 +249,6 @@ get_pkg_name() echo ${1} | sed "s!\([^-][^0-9]*\)-[0-9].*!\1!" } -# Saves the content of CFLAGS and CXXFLAGS environment variables. -save_flags() -{ - export OLDCFLAGS=${CFLAGS} - export OLDCXXFLAGS=${CXXFLAGS} - - return ${EXIT_SUCCESS} -} - -# Saves the content of CFLAGS and CXXFLAGS environment variables, and then -# set them to empty strings. -save_flags_no_optimizations() -{ - export OLDCFLAGS=${CFLAGS} - export OLDCXXFLAGS=${CXXFLAGS} - export CFLAGS="" - export CXXFLAGS="" - - return ${EXIT_SUCCESS} -} - -# Restores the previous values of CFLAGS and CXXFLAGS environment variables. These -# must have been saved first using save_flags(). -restore_flags() -{ - export CFLAGS=${OLDCFLAGS} - export CXXFLAGS=${OLDCXXFLAGS} - - return ${EXIT_SUCCESS} -} - # Create symbolic links for start/stop scripts in /etc/rc.d # # Arg #1: script name @@ -576,7 +562,7 @@ hv_groupadd() done if ! cat /etc/group | egrep -q "^${groupname}:"; then - groupadd ${arguments} + groupadd ${arguments} fi } @@ -599,11 +585,21 @@ hv_useradd() # Applying patch # First argument is the name of the patch -# Second argument is the package name (target dir in $LFS_TMP) +# Second argument is the package name +# 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 TARGET_DIR=${2} + local PACKAGE=${2} + local PDIR=${3} + local TARGET_DIR="" + + if [ $# -eq 4 ]; then + TARGET_DIR=${4}/${PACKAGE} + else + TARGET_DIR=${LFS_TMP}/${PACKAGE} + fi if [ -z "${PATCH_FILE}" ]; then echo @@ -611,14 +607,14 @@ apply_patch() 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 ${LFS_TMP}/${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. @@ -631,7 +627,7 @@ apply_patch() apply_patches() { PACKAGE=${1} - local TARGET_DIR=${PACKAGE} + local TARGET_DIR="" # Checking for correct number of arguments if [ $# -gt 2 ]; then @@ -642,17 +638,19 @@ apply_patches() if [ $# -eq 2 ]; then TARGET_DIR=${2} - else - TARGET_DIR=${PACKAGE} 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} ${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 $? } @@ -677,9 +675,10 @@ static_decompressed_dirname() # and extract base directory name with awk. # tar 1.23 reports an error when using pipes, so # remove error message with "2> /dev/null" + # (we extract the last line from tar output) DIRNAME=$(tar ${TAR_OPTS} -tf \ ${LFS_PKG_DIR}/${PACKAGE}.${arch_ext} 2> /dev/null | \ - head -n1 | sed 's!^\./!!' | awk -F \/ '{print $1}') + tail -n 1 | sed 's!^\./!!' | awk -F \/ '{print $1}') ;; zip) DIRNAME=$(unzip -l \ @@ -786,7 +785,7 @@ ipkg_display_build_infos() echo " BUILD64: ${BUILD64}" echo " CFLAGS: ${CFLAGS}" echo " CPPFLAGS: ${CPPFLAGS}" - echo " CXXFLAGS: ${CFLAGS}" + echo " CXXFLAGS: ${CXXFLAGS}" echo " LDFLAGS: ${LDFLAGS}" echo " RANLIB: ${RANLIB}" echo " CC: ${CC}" @@ -817,6 +816,8 @@ indicate_pkg_build_complete() local PACKAGE_DONE=${LFS_LOG_DIR}/${HVLABEL}.done ipkg_display_build_infos > ${PACKAGE_STATUS} + echo "Source size: " ${SOURCE_SIZE} >> ${PACKAGE_STATUS} + echo "Build size: " ${BUILD_SIZE} >> ${PACKAGE_STATUS} echo -n "Build time: " >> ${PACKAGE_STATUS} display_build_time >> ${PACKAGE_STATUS} echo -e "\n" >> ${PACKAGE_STATUS} @@ -827,6 +828,7 @@ indicate_pkg_build_complete() # Arg. #1: Package name and version (ex: gcc-4.5.1) # Remaining arguments: Additional configure options # Options: +# -c Do not decompress package # -j Disable parallel make for this package # -l Unique identification label in 'install.log' # (default is package name and version) @@ -837,21 +839,29 @@ indicate_pkg_build_complete() # gnome # xorg # pm +# -t Enable dependency tracking # -s Name of script to source (default is from name of package) ipkg() { START_TIME=$(echo `date +%s`) unset ALT_SCRIPT_NAME + + export DECOMPRESS="1" export IPKG_MODE="ac" # Default mode if not specified export HVLABEL="" # Global variable + export ENABLE_DEPENDENCY_TRACKING="0" local HVMAKE_ORIG=${HVMAKE} - while getopts "jl:m:s:" flag ;do + while getopts "cjl:m:s:t" flag ;do case ${flag} in + c) + # Do not decompress package + DECOMPRESS="0" + ;; j) - # Disable parallel make onlyfor this package + # Disable parallel make only for this package HVMAKE="make" ;; l) @@ -874,6 +884,10 @@ ipkg() # Alternate script name ALT_SCRIPT_NAME=${OPTARG} ;; + t) + # Do not disable dependency tracking + ENABLE_DEPENDENCY_TRACKING="1" + ;; ?) echo "${FUNCNAME}(): Invalid option: ${OPTARG}." return 1 @@ -906,12 +920,16 @@ ipkg() PACKAGE_LOG=${LFS_LOG_DIR}/${HVLABEL}.log PACKAGE_DONE=${LFS_LOG_DIR}/${HVLABEL}.done + PACKAGE_STATUS=${LFS_LOG_DIR}/${HVLABEL}.status # Checking if package was previously successfully installed if [ -f ${PACKAGE_DONE} ]; then return $EXIT_SUCCESS fi + # Create or empty status file + cp /dev/null ${PACKAGE_STATUS} + # Displaying label MSGSTRING="Installing ${HVLABEL}" display_checkbox_msg ${MSGSTRING} @@ -935,6 +953,12 @@ ipkg() # Make sure we are at a known location cd ${SCRDIR} + if [ "x${LFS_STAGE}" != "xstage0" -a "x${LFS_STAGE}" != "xstage1" ]; then + # Make sure to update dynamic linker run-time bindings, except for + # stages 0 and 1 where we run as the LFS user. + ldconfig + fi + exec 1>&6 # Restore stdout. # Displaying build time after the package name. @@ -999,12 +1023,16 @@ rscr() PACKAGE_LOG=${LFS_LOG_DIR}/${HVLABEL}.log PACKAGE_DONE=${LFS_LOG_DIR}/${HVLABEL}.done + PACKAGE_STATUS=${LFS_LOG_DIR}/${HVLABEL}.status if [ "x${SCRMODE}" = "xonce" ]; then # Checking if package was previously successfully installed if [ -f ${PACKAGE_DONE} ]; then return $EXIT_SUCCESS fi + + # Create or empty status file + cp /dev/null ${PACKAGE_STATUS} fi display_checkbox_msg ${MSGSTRING} @@ -1012,7 +1040,7 @@ rscr() ipkg_trap_setup echo "------------------------" 1>> ${LFS_LOG_FILE} - echo ${HVLABEL} 1>> ${LFS_LOG_FILE} + echo "Running script ${HVLABEL}" 1>> ${LFS_LOG_FILE} # Executing script ${SCRDIR}/${SCRIPT} ${SCRIPT_ARGS} 1>> ${PACKAGE_LOG} 2>&1 @@ -1024,7 +1052,7 @@ rscr() echo "Completed" 1>> ${LFS_LOG_FILE} if [ "x${SCRMODE}" = "xonce" ]; then - # Report successfull installation of the package. + # Report successfull installation of the script. indicate_pkg_build_complete ${HVLABEL} fi