diff options
| author |   David Holsgrove <david.holsgrove@xilinx.com> | 2012-10-11 04:39:42 (GMT) |
|---|---|---|
| committer | David Holsgrove <david.holsgrove@xilinx.com> | 2012-10-11 04:39:42 (GMT) |
| commit | 33d3919c3e7281ac2ea4b830984d77cf42649d0f (patch) | |
| tree | cc7c69da4f6e85af57d7cda0586dde19dc43ea4e /scripts | |
| parent | 2ace8ed697e17859376364d02b88b8539a2bf9af (diff) | |
binutils/elf2flt: Add CUSTOM version, CUSTOM_LOCATION config options, GetCustom
CUSTOM_LOCATION config options only presented in menuconfig if component
CUSTOM version selected.
Change elf2flt CT_ELF2FLT_VERSION from 'head' to 'cvs' if cvs selected in config
Also remove hardcoded 'cvs-' from elf2flt component name, used in CT_Extract,
CT_Patch and as the CT_SRC_DIR location for the configure stage.
Signed-off-by: "David Holsgrove" <david.holsgrove@xilinx.com>
[yann.morin.1998@free.fr: fix indentation, don't patch custom dir location]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <288db3721a37844defa5.1349931196@localhost.localdomain>
PatchWork-Id: 190789
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/binutils/elf2flt.sh | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/scripts/build/binutils/elf2flt.sh b/scripts/build/binutils/elf2flt.sh index 89fc6c7..d9d8e0e 100644 --- a/scripts/build/binutils/elf2flt.sh +++ b/scripts/build/binutils/elf2flt.sh @@ -13,17 +13,27 @@ if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then # Download elf2flt do_elf2flt_get() { - CT_GetCVS "elf2flt-cvs-${CT_ELF2FLT_VERSION}" \ - ":pserver:anonymous@cvs.uclinux.org:/var/cvs" \ - "elf2flt" \ - "" \ - "elf2flt-cvs-${CT_ELF2FLT_VERSION}" + if [ "${CT_ELF2FLT_CUSTOM}" = "y" ]; then + CT_GetCustom "elf2flt" "${ELF2FLT_VERSION}" \ + "${CT_ELF2FLT_CUSTOM_LOCATION}" + else + CT_GetCVS "elf2flt-${CT_ELF2FLT_VERSION}" \ + ":pserver:anonymous@cvs.uclinux.org:/var/cvs" \ + "elf2flt" \ + "" \ + "elf2flt-${CT_ELF2FLT_VERSION}" + fi } # Extract elf2flt do_elf2flt_extract() { - CT_Extract "elf2flt-cvs-${CT_ELF2FLT_VERSION}" - CT_Patch "elf2flt-cvs" "${CT_ELF2FLT_VERSION}" + # If using custom directory location, nothing to do + if [ "${CT_ELF2FLT_CUSTOM}" = "y" \ + -a -d "${CT_SRC_DIR}/elf2flt-${CT_ELF2FLT_VERSION}" ]; then + return 0 + fi + CT_Extract "elf2flt-${CT_ELF2FLT_VERSION}" + CT_Patch "elf2flt" "${CT_ELF2FLT_VERSION}" } # Build elf2flt for build -> target @@ -111,7 +121,7 @@ do_elf2flt_backend() { CT_DoLog EXTRA "Configuring elf2flt" CT_DoExecLog CFG \ CFLAGS="${host_cflags}" \ - "${CT_SRC_DIR}/elf2flt-cvs-${CT_ELF2FLT_VERSION}/configure" \ + "${CT_SRC_DIR}/elf2flt-${CT_ELF2FLT_VERSION}/configure" \ --build=${CT_BUILD} \ --host=${host} \ --target=${CT_TARGET} \ |