r2479 - jhalfs/branches/experimental/common

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Tue Apr 4 17:36:38 PDT 2006


Author: georgeb
Date: 2006-04-04 18:36:38 -0600 (Tue, 04 Apr 2006)
New Revision: 2479

Modified:
   jhalfs/branches/experimental/common/func_validate_configs.sh
Log:
common/func_validate_config.sh, clean up some coding when checking ARCH vs TARGET

Modified: jhalfs/branches/experimental/common/func_validate_configs.sh
===================================================================
--- jhalfs/branches/experimental/common/func_validate_configs.sh	2006-04-04 22:59:08 UTC (rev 2478)
+++ jhalfs/branches/experimental/common/func_validate_configs.sh	2006-04-05 00:36:38 UTC (rev 2479)
@@ -22,59 +22,49 @@
  echo -e "`eval echo $PARAM_VALS`"
 
  case "${ARCH}" in
-   "x86")      [[ "${TARGET}" = "i486-pc-linux-gnu" ]] && return
-               [[ "${TARGET}" = "i586-pc-linux-gnu" ]] && return
-               [[ "${TARGET}" = "i686-pc-linux-gnu" ]] && return
-        write_error_and_die
+   "x86")        [[ "${TARGET}" = "i486-pc-linux-gnu" ]] && return
+                 [[ "${TARGET}" = "i586-pc-linux-gnu" ]] && return
+                 [[ "${TARGET}" = "i686-pc-linux-gnu" ]] && return
     ;;
-   "ppc")      [[ "${TARGET}" = "powerpc-unknown-linux-gnu" ]] && return
-        write_error_and_die
+   "ppc")        [[ "${TARGET}" = "powerpc-unknown-linux-gnu" ]] && return
     ;;
-   "mips")     [[ "${TARGET}" = "mipsel-unknown-linux-gnu" ]] && return
-               [[ "${TARGET}" = "mips-unknown-linux-gnu"   ]] && return
-        write_error_and_die
+   "mips")       [[ "${TARGET}" = "mipsel-unknown-linux-gnu" ]] && return
+                 [[ "${TARGET}" = "mips-unknown-linux-gnu"   ]] && return
     ;;
-   "sparc")    [[ "${TARGET}" = "sparcv9-unknown-linux-gnu" ]] && return
-        write_error_and_die
+   "sparc")      [[ "${TARGET}" = "sparcv9-unknown-linux-gnu" ]] && return
     ;;
-   "sparcv8")  [[ "${TARGET}" = "sparc-unknown-linux-gnu" ]] && return
-        write_error_and_die
+   "sparcv8")    [[ "${TARGET}" = "sparc-unknown-linux-gnu" ]] && return
     ;;
-   "x86_64-64") [[ "${TARGET}" = "x86_64-unknown-linux-gnu" ]] && return
-        write_error_and_die
+   "x86_64-64")  [[ "${TARGET}" = "x86_64-unknown-linux-gnu" ]] && return
     ;;
    "mips64-64")  [[ "${TARGET}" = "mipsel-unknown-linux-gnu" ]] && return
                  [[ "${TARGET}" = "mips-unknown-linux-gnu"   ]] && return
-        write_error_and_die
     ;;
    "sparc64-64") [[ "${TARGET}" = "sparc64-unknown-linux-gnu" ]] && return
-        write_error_and_die
     ;;
    "alpha")      [[ "${TARGET}" = "alpha-unknown-linux-gnu" ]] && return
-        write_error_and_die
     ;;
    "x86_64")     [[ "${TARGET}"   = "x86_64-unknown-linux-gnu" ]] &&
                  [[ "${TARGET32}" = "i686-pc-linux-gnu" ]] && return
-        write_error_and_die
     ;;
    "mips64")     [[ "${TARGET}"   = "mipsel-unknown-linux-gnu" ]] &&
                  [[ "${TARGET32}" = "mipsel-unknown-linux-gnu" ]] && return
 
                  [[ "${TARGET}"   = "mips-unknown-linux-gnu" ]] &&
                  [[ "${TARGET32}" = "mips-unknown-linux-gnu" ]] && return
-        write_error_and_die
     ;;
-   "sparc64")   [[ "${TARGET}"   = "sparc64-unknown-linux-gnu" ]] &&
-                [[ "${TARGET32}" = "sparcv9-unknown-linux-gnu" ]] && return
-        write_error_and_die
+   "sparc64")    [[ "${TARGET}"   = "sparc64-unknown-linux-gnu" ]] &&
+                 [[ "${TARGET32}" = "sparcv9-unknown-linux-gnu" ]] && return
     ;;
-   "ppc64")    [[ "${TARGET}"   = "powerpc64-unknown-linux-gnu" ]] &&
-               [[ "${TARGET32}" = "powerpc-unknown-linux-gnu"   ]] && return
-        write_error_and_die
+   "ppc64")      [[ "${TARGET}"   = "powerpc64-unknown-linux-gnu" ]] &&
+                 [[ "${TARGET32}" = "powerpc-unknown-linux-gnu"   ]] && return
     ;;
    *)  write_error_and_die
    ;;
  esac
+
+   # If you end up here then there was an error SO...
+   write_error_and_die
 }
 
 




More information about the alfs-log mailing list