1.1 --- a/config/binutils/binutils.in.2 Sun May 11 17:47:53 2014 +0200
1.2 +++ b/config/binutils/binutils.in.2 Sun May 11 15:43:28 2014 +0200
1.3 @@ -7,12 +7,10 @@
1.4 choice
1.5 bool
1.6 prompt "elf2flt version"
1.7 -# Don't remove next line
1.8 -# CT_INSERT_VERSION_BELOW
1.9
1.10 -config ELF2FLT_CVSHEAD
1.11 +config ELF2FLT_GIT
1.12 bool
1.13 - prompt "CVS Head"
1.14 + prompt "git"
1.15 help
1.16 Grab the latest version of elf2flt from the CVS repository
1.17
1.18 @@ -23,8 +21,30 @@
1.19
1.20 endchoice
1.21
1.22 +config ELF2FLT_VERSION
1.23 + string
1.24 +
1.25 +if ELF2FLT_GIT
1.26 +
1.27 +config ELF2FLT_GIT_CSET
1.28 + string
1.29 + prompt "git cset"
1.30 + default "21c6a41885ad544763ccd19883c1353f3b0b7a47"
1.31 + help
1.32 + Enter the git changeset to use.
1.33 +
1.34 + The default currently points to the HEAD of the git tree.
1.35 +
1.36 +config ELF2FLT_VERSION
1.37 + default ELF2FLT_GIT_CSET
1.38 +
1.39 +endif # ELF2FLT_GIT
1.40 +
1.41 if ELF2FLT_CUSTOM
1.42
1.43 +config ELF2FLT_VERSION
1.44 + default "custom"
1.45 +
1.46 config ELF2FLT_CUSTOM_LOCATION
1.47 string
1.48 prompt "Full path to custom elf2flt source"
1.49 @@ -35,13 +55,6 @@
1.50
1.51 endif # ELF2FLT_CUSTOM
1.52
1.53 -config ELF2FLT_VERSION
1.54 - string
1.55 - default "cvs" if ELF2FLT_CVSHEAD
1.56 - default "custom" if ELF2FLT_CUSTOM
1.57 -# Don't remove next line
1.58 -# CT_INSERT_VERSION_STRING_BELOW
1.59 -
1.60 config ELF2FLT_EXTRA_CONFIG_ARRAY
1.61 string
1.62 prompt "elf2flt extra config"
2.1 --- a/scripts/addToolVersion.sh Sun May 11 17:47:53 2014 +0200
2.2 +++ b/scripts/addToolVersion.sh Sun May 11 15:43:28 2014 +0200
2.3 @@ -193,7 +193,6 @@
2.4 # Tools:
2.5 --gcc) EXP=; OBS=; cat=CC; tool=gcc; tool_prefix=cc; dot2suffix=;;
2.6 --binutils) EXP=; OBS=; cat=BINUTILS; tool=binutils; tool_prefix=binutils; dot2suffix=;;
2.7 - --elf2flt) EXP=; OBS=; cat=BINUTILS; tool=binutils; tool_prefix=binutils; dot2suffix=.2;;
2.8 --glibc) EXP=; OBS=; cat=LIBC_GLIBC; tool=glibc; tool_prefix=libc; dot2suffix=;;
2.9 --eglibc) EXP=; OBS=; cat=LIBC_EGLIBC; tool=eglibc; tool_prefix=libc; dot2suffix=;;
2.10 --uClibc) EXP=; OBS=; cat=LIBC_UCLIBC; tool=uClibc; tool_prefix=libc; dot2suffix=;;
3.1 --- a/scripts/build/binutils/binutils.sh Sun May 11 17:47:53 2014 +0200
3.2 +++ b/scripts/build/binutils/binutils.sh Sun May 11 15:43:28 2014 +0200
3.3 @@ -14,11 +14,7 @@
3.4 fi
3.5
3.6 if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then
3.7 - CT_GetCVS "elf2flt-${CT_ELF2FLT_VERSION}" \
3.8 - ":pserver:anonymous@cvs.uclinux.org:/var/cvs" \
3.9 - "elf2flt" \
3.10 - "" \
3.11 - "elf2flt-${CT_ELF2FLT_VERSION}"
3.12 + CT_GetGit elf2flt "${CT_ELF2FLT_GIT_CSET}" git://wh0rd.org/elf2flt.git
3.13 fi
3.14 }
3.15
3.16 @@ -34,8 +30,8 @@
3.17 CT_Patch "binutils" "${CT_BINUTILS_VERSION}"
3.18
3.19 if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then
3.20 - CT_Extract "elf2flt-${CT_ELF2FLT_VERSION}"
3.21 - CT_Patch "elf2flt" "${CT_ELF2FLT_VERSION}"
3.22 + CT_Extract "elf2flt-${CT_ELF2FLT_GIT_CSET}"
3.23 + CT_Patch "elf2flt" "${CT_ELF2FLT_GIT_CSET}"
3.24 fi
3.25 }
3.26