zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved book version number extraction. Corrected CORRECT TARGET/TARGET32 values

Browse source
This commit is contained in:
George Boudreau 2006-06-24 14:39:17 +00:00
parent 1ff67686df
commit 6f2cd962e8
3 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CLFS/config
View file

@ -22,16 +22,16 @@ TARGET=
#-------------------------------- #--------------------------------
# >>>> 64-64 BUILD <<<< # >>>> 64-64 BUILD <<<<
# ARCH=x86_64-64 ; TARGET="x86_64-unknown-linux-gnu" # ARCH=x86_64-64 ; TARGET="x86_64-unknown-linux-gnu"
# ARCH=mips64-64 ; TARGET="mipsel-unknown-linux-gnu" # ARCH=mips64-64 ; TARGET="mips64el-unknown-linux-gnu"
# ARCH=mips64-64 ; TARGET="mips-unknown-linux-gnu" # ARCH=mips64-64 ; TARGET="mips64-unknown-linux-gnu"
# ARCH=sparc64-64 ; TARGET="sparc64-unknown-linux-gnu" # ARCH=sparc64-64 ; TARGET="sparc64-unknown-linux-gnu"
# ARCH=alpha ; TARGET="alpha-unknown-linux-gnu" # ARCH=alpha ; TARGET="alpha-unknown-linux-gnu"
#-------------------------------- #--------------------------------
# >>>> MULTILIB 32/64 <<<< # >>>> MULTILIB 32/64 <<<<
# ARCH=x86_64 ; TARGET="x86_64-unknown-linux-gnu" ; TARGET32="i686-pc-linux-gnu" # ARCH=x86_64 ; TARGET="x86_64-unknown-linux-gnu" ; TARGET32="i686-pc-linux-gnu"
# ARCH=mips64 ; TARGET="mipsel-unknown-linux-gnu" ; TARGET32="mipsel-unknown-linux-gnu" # ARCH=mips64 ; TARGET="mips64el-unknown-linux-gnu" ; TARGET32="mipsel-unknown-linux-gnu"
# ARCH=mips64 ; TARGET="mips-unknown-linux-gnu" ; TARGET32="mips-unknown-linux-gnu" # ARCH=mips64 ; TARGET="mips64-unknown-linux-gnu" ; TARGET32="mips-unknown-linux-gnu"
# ARCH=sparc64 ; TARGET="sparc64-unknown-linux-gnu" ; TARGET32="sparcv9-unknown-linux-gnu" # ARCH=sparc64 ; TARGET="sparc64-unknown-linux-gnu" ; TARGET32="sparc-unknown-linux-gnu"
# ARCH=ppc64 ; TARGET="powerpc64-unknown-linux-gnu" ; TARGET32="powerpc-unknown-linux-gnu" # ARCH=ppc64 ; TARGET="powerpc64-unknown-linux-gnu" ; TARGET32="powerpc-unknown-linux-gnu"
#--- What build method should be used chroot/boot #--- What build method should be used chroot/boot

9
CLFS/master.sh
View file

@ -159,6 +159,15 @@ temptools_Makefiles() { #
for file in temp-system/* ; do for file in temp-system/* ; do
# Keep the script file name # Keep the script file name
this_script=`basename $file` this_script=`basename $file`
#
# Deal with any odd scripts..
case $this_script in
*choose) # The choose script will fail if you cannot enter the new environment
# If the 'boot' build method was chosen don't run the script
[[ $METHOD = "boot" ]] && continue; ;;
*) ;;
esac
# #
# First append each name of the script files to a list (this will become # First append each name of the script files to a list (this will become
# the names of the targets in the Makefile # the names of the targets in the Makefile

10
common/func_validate_configs.sh
View file

@ -36,8 +36,8 @@ validate_target() { #
;; ;;
"x86_64-64") [[ "${TARGET}" = "x86_64-unknown-linux-gnu" ]] && return "x86_64-64") [[ "${TARGET}" = "x86_64-unknown-linux-gnu" ]] && return
;; ;;
"mips64-64") [[ "${TARGET}" = "mipsel-unknown-linux-gnu" ]] && return "mips64-64") [[ "${TARGET}" = "mips64el-unknown-linux-gnu" ]] && return
[[ "${TARGET}" = "mips-unknown-linux-gnu" ]] && return [[ "${TARGET}" = "mips64-unknown-linux-gnu" ]] && return
;; ;;
"sparc64-64") [[ "${TARGET}" = "sparc64-unknown-linux-gnu" ]] && return "sparc64-64") [[ "${TARGET}" = "sparc64-unknown-linux-gnu" ]] && return
;; ;;
@ -46,14 +46,14 @@ validate_target() { #
"x86_64") [[ "${TARGET}" = "x86_64-unknown-linux-gnu" ]] && "x86_64") [[ "${TARGET}" = "x86_64-unknown-linux-gnu" ]] &&
[[ "${TARGET32}" = "i686-pc-linux-gnu" ]] && return [[ "${TARGET32}" = "i686-pc-linux-gnu" ]] && return
;; ;;
"mips64") [[ "${TARGET}" = "mipsel-unknown-linux-gnu" ]] && "mips64") [[ "${TARGET}" = "mips64el-unknown-linux-gnu" ]] &&
[[ "${TARGET32}" = "mipsel-unknown-linux-gnu" ]] && return [[ "${TARGET32}" = "mipsel-unknown-linux-gnu" ]] && return
[[ "${TARGET}" = "mips-unknown-linux-gnu" ]] && [[ "${TARGET}" = "mips64-unknown-linux-gnu" ]] &&
[[ "${TARGET32}" = "mips-unknown-linux-gnu" ]] && return [[ "${TARGET32}" = "mips-unknown-linux-gnu" ]] && return
;; ;;
"sparc64") [[ "${TARGET}" = "sparc64-unknown-linux-gnu" ]] && "sparc64") [[ "${TARGET}" = "sparc64-unknown-linux-gnu" ]] &&
[[ "${TARGET32}" = "sparcv9-unknown-linux-gnu" ]] && return [[ "${TARGET32}" = "sparc-unknown-linux-gnu" ]] && return
;; ;;
"ppc64") [[ "${TARGET}" = "powerpc64-unknown-linux-gnu" ]] && "ppc64") [[ "${TARGET}" = "powerpc64-unknown-linux-gnu" ]] &&
[[ "${TARGET32}" = "powerpc-unknown-linux-gnu" ]] && return [[ "${TARGET32}" = "powerpc-unknown-linux-gnu" ]] && return