binutils/elf2flt: restore the custom location functionality
author"Yann E. MORIN" <yann.morin.1998@free.fr>
Sun May 11 17:51:33 2014 +0200 (2014-05-11)
changeset 33176b2c4692f132
parent 3316 42590ff8521c
child 3318 579bc9107f99
binutils/elf2flt: restore the custom location functionality

Somehow, it got lost when incorporating elf2flt in the binutils farmework.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
scripts/build/binutils/binutils.sh
     1.1 --- a/scripts/build/binutils/binutils.sh	Sun May 11 18:42:30 2014 +0200
     1.2 +++ b/scripts/build/binutils/binutils.sh	Sun May 11 17:51:33 2014 +0200
     1.3 @@ -14,7 +14,12 @@
     1.4      fi
     1.5  
     1.6      if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then
     1.7 -        CT_GetGit elf2flt "${CT_ELF2FLT_GIT_CSET}" git://wh0rd.org/elf2flt.git
     1.8 +        if [ "${CT_ELF2FLT_CUSTOM}" = "y" ]; then
     1.9 +            CT_GetCustom "elf2flt" "${CT_ELF2FLT_VERSION}"  \
    1.10 +                         "${CT_ELF2FLT_CUSTOM_LOCATION}"
    1.11 +        else
    1.12 +            CT_GetGit elf2flt "${CT_ELF2FLT_GIT_CSET}" git://wh0rd.org/elf2flt.git
    1.13 +        fi
    1.14      fi
    1.15  }
    1.16  
    1.17 @@ -28,8 +33,11 @@
    1.18      fi
    1.19  
    1.20      if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then
    1.21 -        CT_Extract "elf2flt-${CT_ELF2FLT_GIT_CSET}"
    1.22 -        CT_Patch "elf2flt" "${CT_ELF2FLT_GIT_CSET}"
    1.23 +        if ! [ "${CT_ELF2FLT_CUSTOM}" = "y" \
    1.24 +             -a -d "${CT_SRC_DIR}/elf2flt-${CT_ELF2FLT_VERSION}" ]; then
    1.25 +            CT_Extract "elf2flt-${CT_ELF2FLT_GIT_CSET}"
    1.26 +            CT_Patch "elf2flt" "${CT_ELF2FLT_GIT_CSET}"
    1.27 +        fi
    1.28      fi
    1.29  }
    1.30