X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fipkg;h=77f51c4d92e050f050213ef7713f532ec8822430;hb=2b86b5b69df77007ae7fd31fc1ae39361a1a9019;hp=9d3ea3ed1f5ae5c272807ab05523f2c64050bc9a;hpb=564ec1bbb321286571c30da20b81620c33b18e6f;p=hvlinux.git diff --git a/functions/ipkg b/functions/ipkg index 9d3ea3e..77f51c4 100644 --- a/functions/ipkg +++ b/functions/ipkg @@ -1,5 +1,12 @@ #!/bin/bash +# Global input variables: +# PACKAGE_STATUS +# +# Global output variables: +# BUILD_SIZE +# SOURCE_SIZE + function_exists() { local FUNCTION_NAME=$1 @@ -29,8 +36,8 @@ ipkg_decompress_package() mv -v ${LFS_TMP}/${DECOMPRESSED_DIRNAME} ${LFS_TMP}/${PACKAGE} fi - # Displaying package source size in log file - echo " Source size:" $(du -h -s ${LFS_TMP}/${PACKAGE} | awk '{ print $1 }') 1>> ${LFS_LOG_FILE} + # Saving package source size in global variable. + SOURCE_SIZE=$(du -h -s ${LFS_TMP}/${PACKAGE} | awk '{ print $1 }') # Removing old build directory (if any) if [ -d ${LFS_TMP}/${PACKAGE}-build ]; then @@ -90,9 +97,8 @@ ipkg_finish() # Make sure to return to scripts directory cd ${SCRDIR} - # Displaying package build size in log file + # Saving package build size in global variable BUILD_SIZE=$(du -h -s -c ${LFS_TMP}/${PACKAGE} ${LFS_TMP}/${PACKAGE}-build | grep total | awk '{ print $1 }') - echo " Build size : ${BUILD_SIZE}" 1>> ${LFS_LOG_FILE} # Some scripts need to preserve the source or build directory. They can # do so by renaming them. @@ -118,7 +124,6 @@ ipkg_script() else # Use default script name PACKAGE_DEF=${SCRDIR}/pkg/$(get_pkg_name ${PACKAGE}) - fi ipkg_decompress_package @@ -151,7 +156,7 @@ ipkg_script() --cache-file=${LFS_TMP}/${PACKAGE}-build/config.cache" fi - if [ "x${IPKG_MODE}" != "xnoac" ]; then + if [ -x ${LFS_TMP}/${PACKAGE}/configure ]; then # Add option --disable-dependency-tracking if supported if cat ${LFS_TMP}/${PACKAGE}/configure | \ grep -q "disable-dependency-tracking"; then