X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=functions%2Fmain;h=76aa3a057cf8d78ab20b16f2820b3e9466c26dfb;hb=4764a3fcf7c824f580140f1226b6d0718f7cef9c;hp=ae0d16303d5b6ba962f18b0b9d868db5cc29c1a9;hpb=fd7d0d6a1ec9d227e64d48ab65849a8061fc2fe2;p=hvlinux.git

diff --git a/functions/main b/functions/main
index ae0d163..76aa3a0 100644
--- a/functions/main
+++ b/functions/main
@@ -49,6 +49,8 @@ source ./stage.def
 
 # Load functions
 source ../functions/fpkg
+source ../functions/lpkg
+source ../functions/version
 
 # Constants for return codes
 EXIT_SUCCESS=0
@@ -118,7 +120,7 @@ if [ -z "${LFS_STAGE}" ]; then
     return ${EXIT_FAILURE}
 fi
 
-if [ "x${LFS_STAGE}" != "xstage0" -a "x${LFS_STAGE}" != "xstage1" ] ;then
+if [ "x${LFS_STAGE}" != "xstage0" -a "x${LFS_STAGE}" != "xstage1" ]; then
     LFS=""
 fi
 
@@ -168,6 +170,20 @@ get_pkg_ver_base()
     echo ${1} | sed "s!^.*-\([0-9]*\.[0-9]*\).*!\1!g"
 }
 
+# Extracting the 3-digit version number from a complete package name.
+# Arg. #1: Complete package name with version
+# (ex: linux-2.6.37.1 will output 2.6.37)
+get_pkg_ver3()
+{
+    # 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]*\.[0-9]*\.[0-9]*\).*!\1!g"
+}
+
 # Extracting the base version number from a complete package name.
 # Arg. #1: Complete package name with version (ex: gcc-3.4.4 will output 3)
 get_pkg_ver_major()
@@ -926,11 +942,16 @@ rscr()
 	exit ${EXIT_FAILURE}
     fi
 
-    # Checking if script is valid and executable
-    if [ ! -x ${SCRDIR}/${SCRIPT} ]; then
+    # Checking if script file is found
+    if [ ! -f ${SCRDIR}/${SCRIPT} ]; then
 	echo "${FUNCNAME}(): script not found: ${SCRIPT}"
 	exit ${EXIT_FAILURE}
     fi
+    # ... and make sure it is executable
+    if [ ! -x ${SCRDIR}/${SCRIPT} ]; then
+	echo "${FUNCNAME}(): execute bit not set: ${SCRIPT}"
+	exit ${EXIT_FAILURE}
+    fi
 
     PACKAGE_LOG=${LFS_LOG_DIR}/${HVLABEL}.log
 
@@ -1106,7 +1127,8 @@ print_status()
     if [ $# -ne 1 ]; then
         # If no parameters are given to the print_status function, print usage
         # information.
-	echo "Usage: ${FUNCNAME}() {success|warning|failure} [STRING] [TIME]"
+	echo "Usage: ${FUNCNAME}() {success|warning|failure}"
+	echo "       got: \"${*}\""
 	return ${EXIT_FAILURE}
     fi