X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=functions%2Fmain;h=7c071db87c1315543d82765e3929298920eb0b88;hb=b9d631f0388fefe31b05813855ed35e1624707dd;hp=d8881684c4126bc7a6ce497c616035e1c496976f;hpb=d9702c4a5c6fbf2c738ffbf9c3563daf552c91d8;p=hvlinux.git

diff --git a/functions/main b/functions/main
index d888168..7c071db 100644
--- a/functions/main
+++ b/functions/main
@@ -51,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
@@ -87,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"
@@ -106,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}
@@ -115,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()
 {
@@ -178,6 +179,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()