r2595 - in jhalfs/branches/experimental: . CLFS common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sat Apr 29 07:26:57 PDT 2006


Author: manuel
Date: 2006-04-29 08:26:56 -0600 (Sat, 29 Apr 2006)
New Revision: 2595

Modified:
   jhalfs/branches/experimental/CLFS/config
   jhalfs/branches/experimental/common/common-functions
   jhalfs/branches/experimental/common/func_validate_configs.sh
   jhalfs/branches/experimental/master.sh
Log:
Merged r2547 from trunk (removal of sparcv8 arch in CLFS)

Modified: jhalfs/branches/experimental/CLFS/config
===================================================================
--- jhalfs/branches/experimental/CLFS/config	2006-04-29 14:16:06 UTC (rev 2594)
+++ jhalfs/branches/experimental/CLFS/config	2006-04-29 14:26:56 UTC (rev 2595)
@@ -20,7 +20,6 @@
 # ARCH=mips ;    TARGET="mipsel-unknown-linux-gnu"
 # ARCH=mips ;    TARGET="mips-unknown-linux-gnu"
 # ARCH=sparc ;   TARGET="sparcv9-unknown-linux-gnu"
-# ARCH=sparcv8 ; TARGET="sparc-unknown-linux-gnu"
 #--------------------------------
 # >>>> 64-64 BUILD <<<<
 # ARCH=x86_64-64  ; TARGET="x86_64-unknown-linux-gnu"

Modified: jhalfs/branches/experimental/common/common-functions
===================================================================
--- jhalfs/branches/experimental/common/common-functions	2006-04-29 14:16:06 UTC (rev 2594)
+++ jhalfs/branches/experimental/common/common-functions	2006-04-29 14:26:56 UTC (rev 2595)
@@ -107,7 +107,7 @@
 ${BOLD}  -A, --arch ARCH ${OFF}
         Select the TARGET architecture, valid selections are:
            32bit builds
-        x86, i486, i586, ppc, mips, mipsel, sparc, sparcv8
+        x86, i486, i586, ppc, mips, mipsel, sparc
            64bit builds
         x86_64-64, mips64-64, mipsel64-64, sparc64-64, alpha
            64bit multi-lib

Modified: jhalfs/branches/experimental/common/func_validate_configs.sh
===================================================================
--- jhalfs/branches/experimental/common/func_validate_configs.sh	2006-04-29 14:16:06 UTC (rev 2594)
+++ jhalfs/branches/experimental/common/func_validate_configs.sh	2006-04-29 14:26:56 UTC (rev 2595)
@@ -34,8 +34,6 @@
     ;;
    "sparc")      [[ "${TARGET}" = "sparcv9-unknown-linux-gnu" ]] && return
     ;;
-   "sparcv8")    [[ "${TARGET}" = "sparc-unknown-linux-gnu" ]] && return
-    ;;
    "x86_64-64")  [[ "${TARGET}" = "x86_64-unknown-linux-gnu" ]] && return
     ;;
    "mips64-64")  [[ "${TARGET}" = "mipsel-unknown-linux-gnu" ]] && return
@@ -213,7 +211,7 @@
       MODEL)      validate_against_str "xglibcx xuclibcx" ;;
       PAGE)       validate_against_str "xletterx xA4x" ;;
       METHOD)     validate_against_str "xchrootx xbootx" ;;
-      ARCH)       validate_against_str "xx86x xx86_64x xx86_64-64x xsparcx xsparcv8x xsparc64x xsparc64-64x xmipsx xmips64x xmips64-64x xppcx xppc64x xalphax" ;;
+      ARCH)       validate_against_str "xx86x xx86_64x xx86_64-64x xsparcx xsparc64x xsparc64-64x xmipsx xmips64x xmips64-64x xppcx xppc64x xalphax" ;;
       TARGET)     validate_target ;;
       GRSECURITY_HOST)  validate_against_str "x0x x1x" ;;
 

Modified: jhalfs/branches/experimental/master.sh
===================================================================
--- jhalfs/branches/experimental/master.sh	2006-04-29 14:16:06 UTC (rev 2594)
+++ jhalfs/branches/experimental/master.sh	2006-04-29 14:26:56 UTC (rev 2595)
@@ -299,10 +299,6 @@
           ARCH=sparc
           TARGET="sparcv9-unknown-linux-gnu"
           ;;
-        sparcv8 )
-          ARCH=sparcv8
-          TARGET="sparc-unknown-linux-gnu"
-          ;;
         x86_64-64 )
           ARCH=x86_64-64
           TARGET="x86_64-unknown-linux-gnu"




More information about the alfs-log mailing list