X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=functions%2Fmain;h=6fcafdf4ebe56c9021ff9ef875a3b6eeafce9a8c;hb=d98da13bfa3454ed0c2d08774042ec37f503417a;hp=b02efa85dbff321b3d5645b9ce84ff60b90031f0;hpb=c30fb25c21971a9ef055c8eb6d02be264bff1d8d;p=hvlinux.git diff --git a/functions/main b/functions/main index b02efa8..6fcafdf 100644 --- a/functions/main +++ b/functions/main @@ -576,7 +576,7 @@ hv_groupadd() done if ! cat /etc/group | egrep -q "^${groupname}:"; then - groupadd ${arguments} + groupadd ${arguments} fi } @@ -817,6 +817,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} @@ -848,6 +850,9 @@ ipkg() local HVMAKE_ORIG=${HVMAKE} + # Make sure to get latest variables assignments (ex: pkg-config) + source /etc/profile + while getopts "jl:m:s:" flag ;do case ${flag} in j) @@ -906,12 +911,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} @@ -948,6 +957,9 @@ ipkg() ipkg_trap_end + # Make sure to update dynamic linker run-time bindings + ldconfig + return $EXIT_SUCCESS } @@ -999,12 +1011,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 +1028,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 +1040,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