summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/binutils/binutils.in.235
-rwxr-xr-xscripts/addToolVersion.sh1
-rw-r--r--scripts/build/binutils/binutils.sh10
3 files changed, 27 insertions, 19 deletions
diff --git a/config/binutils/binutils.in.2 b/config/binutils/binutils.in.2
index 0e74886..cb6c81c 100644
--- a/config/binutils/binutils.in.2
+++ b/config/binutils/binutils.in.2
@@ -7,12 +7,10 @@ comment "elf2flt"
choice
bool
prompt "elf2flt version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-config ELF2FLT_CVSHEAD
+config ELF2FLT_GIT
bool
- prompt "CVS Head"
+ prompt "git"
help
Grab the latest version of elf2flt from the CVS repository
@@ -23,8 +21,30 @@ config ELF2FLT_CUSTOM
endchoice
+config ELF2FLT_VERSION
+ string
+
+if ELF2FLT_GIT
+
+config ELF2FLT_GIT_CSET
+ string
+ prompt "git cset"
+ default "21c6a41885ad544763ccd19883c1353f3b0b7a47"
+ help
+ Enter the git changeset to use.
+
+ The default currently points to the HEAD of the git tree.
+
+config ELF2FLT_VERSION
+ default ELF2FLT_GIT_CSET
+
+endif # ELF2FLT_GIT
+
if ELF2FLT_CUSTOM
+config ELF2FLT_VERSION
+ default "custom"
+
config ELF2FLT_CUSTOM_LOCATION
string
prompt "Full path to custom elf2flt source"
@@ -35,13 +55,6 @@ config ELF2FLT_CUSTOM_LOCATION
endif # ELF2FLT_CUSTOM
-config ELF2FLT_VERSION
- string
- default "cvs" if ELF2FLT_CVSHEAD
- default "custom" if ELF2FLT_CUSTOM
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-
config ELF2FLT_EXTRA_CONFIG_ARRAY
string
prompt "elf2flt extra config"
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh
index a250722..5822a4b 100755
--- a/scripts/addToolVersion.sh
+++ b/scripts/addToolVersion.sh
@@ -193,7 +193,6 @@ while [ $# -gt 0 ]; do
# Tools:
--gcc) EXP=; OBS=; cat=CC; tool=gcc; tool_prefix=cc; dot2suffix=;;
--binutils) EXP=; OBS=; cat=BINUTILS; tool=binutils; tool_prefix=binutils; dot2suffix=;;
- --elf2flt) EXP=; OBS=; cat=BINUTILS; tool=binutils; tool_prefix=binutils; dot2suffix=.2;;
--glibc) EXP=; OBS=; cat=LIBC_GLIBC; tool=glibc; tool_prefix=libc; dot2suffix=;;
--eglibc) EXP=; OBS=; cat=LIBC_EGLIBC; tool=eglibc; tool_prefix=libc; dot2suffix=;;
--uClibc) EXP=; OBS=; cat=LIBC_UCLIBC; tool=uClibc; tool_prefix=libc; dot2suffix=;;
diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh
index 4a052ad..b74d28d 100644
--- a/scripts/build/binutils/binutils.sh
+++ b/scripts/build/binutils/binutils.sh
@@ -14,11 +14,7 @@ do_binutils_get() {
fi
if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then
- CT_GetCVS "elf2flt-${CT_ELF2FLT_VERSION}" \
- ":pserver:anonymous@cvs.uclinux.org:/var/cvs" \
- "elf2flt" \
- "" \
- "elf2flt-${CT_ELF2FLT_VERSION}"
+ CT_GetGit elf2flt "${CT_ELF2FLT_GIT_CSET}" git://wh0rd.org/elf2flt.git
fi
}
@@ -34,8 +30,8 @@ do_binutils_extract() {
CT_Patch "binutils" "${CT_BINUTILS_VERSION}"
if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then
- CT_Extract "elf2flt-${CT_ELF2FLT_VERSION}"
- CT_Patch "elf2flt" "${CT_ELF2FLT_VERSION}"
+ CT_Extract "elf2flt-${CT_ELF2FLT_GIT_CSET}"
+ CT_Patch "elf2flt" "${CT_ELF2FLT_GIT_CSET}"
fi
}