1.1 --- a/config/binutils/sstrip.in	Wed Mar 17 00:24:25 2010 +0100
     1.2 +++ b/config/binutils/sstrip.in	Wed Mar 17 00:28:14 2010 +0100
     1.3 @@ -11,42 +11,7 @@
     1.4      help
     1.5        The sstrip utility, to maximise the striping of ELF binaries
     1.6        (executables and libraries).
     1.7 -
     1.8 -if SSTRIP
     1.9 -
    1.10 -choice
    1.11 -    bool
    1.12 -    prompt "Use sstrip from:"
    1.13 -
    1.14 -config SSTRIP_BUILDROOT
    1.15 -    bool
    1.16 -    prompt "buildroot"
    1.17 -    help
    1.18 +      
    1.19        Buildroot version, forked off the original from ELFkickers.  This one
    1.20        is somewhat maintained by the buildroot guys.   
    1.21        Supports big-endian systems.
    1.22 -
    1.23 -config SSTRIP_ELFKICKERS
    1.24 -    bool
    1.25 -    prompt "ELFkickers (OBSOLETE)"
    1.26 -    depends on OBSOLETE
    1.27 -    help
    1.28 -      The original, ageing version, of sstrip from ELFkickers.
    1.29 -      Fully functional, but not maintained anymore.
    1.30 -
    1.31 -endchoice
    1.32 -
    1.33 -config SSTRIP_FROM
    1.34 -    string
    1.35 -    default "ELFkickers"    if SSTRIP_ELFKICKERS
    1.36 -    default "buildroot"     if SSTRIP_BUILDROOT
    1.37 -
    1.38 -if SSTRIP_ELFKICKERS
    1.39 -
    1.40 -config SSTRIP_ELFKICKERS_VERSION
    1.41 -    string
    1.42 -    default "2.0a"
    1.43 -
    1.44 -endif
    1.45 -
    1.46 -endif # SSTRIP

     2.1 --- a/scripts/build/binutils/sstrip.sh	Wed Mar 17 00:24:25 2010 +0100
     2.2 +++ b/scripts/build/binutils/sstrip.sh	Wed Mar 17 00:28:14 2010 +0100
     2.3 @@ -4,57 +4,32 @@
     2.4  do_tools_sstrip_extract() { :; }
     2.5  do_tools_sstrip() { :; }
     2.6  
     2.7 -case "${CT_SSTRIP_FROM}" in
     2.8 -    ELFkickers)
     2.9 -        do_sstrip_get() {
    2.10 -            CT_GetFile "ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}"     \
    2.11 -                       http://www.muppetlabs.com/~breadbox/pub/software
    2.12 -        }
    2.13 -        do_sstrip_extract() {
    2.14 -            CT_Extract "ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}"
    2.15 -            CT_Patch "ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}"
    2.16 -        }
    2.17 -        do_sstrip() {
    2.18 -            CT_DoStep INFO "Installing sstrip"
    2.19 -            CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}/sstrip"   \
    2.20 -                                    "${CT_BUILD_DIR}/build-strip"
    2.21 -            cd "${CT_BUILD_DIR}/build-strip"
    2.22 +if [ "${CT_SSTRIP}" = "y" ]; then
    2.23 +    do_sstrip_get() {
    2.24 +        CT_GetFile sstrip .c http://git.buildroot.net/buildroot/plain/toolchain/sstrip
    2.25 +    }
    2.26  
    2.27 -            CT_DoLog EXTRA "Building sstrip"
    2.28 -            CT_DoExecLog ALL make CC="${CT_HOST}-gcc" sstrip
    2.29 -            
    2.30 -            CT_DoLog EXTRA "Installing sstrip"
    2.31 -            CT_DoExecLog ALL install -m 755 sstrip "${CT_PREFIX_DIR}/bin/${CT_TARGET}-sstrip"
    2.32 +    do_sstrip_extract() {
    2.33 +        # We leave the sstrip maintenance to the buildroot people:
    2.34 +        # -> any fix-up goes directly there
    2.35 +        # -> we don't have patches for it
    2.36 +        # -> we don't need to patch it
    2.37 +        # -> just create a directory in src/, and copy it there.
    2.38 +        CT_DoExecLog DEBUG mkdir -p "${CT_SRC_DIR}/sstrip"
    2.39 +        CT_DoExecLog DEBUG cp -v "${CT_TARBALLS_DIR}/sstrip.c" "${CT_SRC_DIR}/sstrip"
    2.40 +    }
    2.41  
    2.42 -            CT_EndStep
    2.43 -        }
    2.44 -    ;;
    2.45 +    do_sstrip() {
    2.46 +        CT_DoStep INFO "Installing sstrip"
    2.47 +        mkdir -p "${CT_BUILD_DIR}/build-sstrip"
    2.48 +        cd "${CT_BUILD_DIR}/build-sstrip"
    2.49  
    2.50 -    buildroot)
    2.51 -        do_sstrip_get() {
    2.52 -            CT_GetFile sstrip .c http://git.buildroot.net/buildroot/plain/toolchain/sstrip
    2.53 -        }
    2.54 -        do_sstrip_extract() {
    2.55 -            # We leave the sstrip maintenance to the buildroot people:
    2.56 -            # -> any fix-up goes directly there
    2.57 -            # -> we don't have patches for it
    2.58 -            # -> we don't need to patch it
    2.59 -            # -> just create a directory in src/, and copy it there.
    2.60 -            CT_DoExecLog DEBUG mkdir -p "${CT_SRC_DIR}/sstrip"
    2.61 -            CT_DoExecLog DEBUG cp -v "${CT_TARBALLS_DIR}/sstrip.c" "${CT_SRC_DIR}/sstrip"
    2.62 -        }
    2.63 -        do_sstrip() {
    2.64 -            CT_DoStep INFO "Installing sstrip"
    2.65 -            mkdir -p "${CT_BUILD_DIR}/build-sstrip"
    2.66 -            cd "${CT_BUILD_DIR}/build-sstrip"
    2.67 +        CT_DoLog EXTRA "Building sstrip"
    2.68 +        CT_DoExecLog ALL "${CT_HOST}-gcc" -Wall -o sstrip "${CT_SRC_DIR}/sstrip/sstrip.c"
    2.69  
    2.70 -            CT_DoLog EXTRA "Building sstrip"
    2.71 -            CT_DoExecLog ALL "${CT_HOST}-gcc" -Wall -o sstrip "${CT_SRC_DIR}/sstrip/sstrip.c"
    2.72 +        CT_DoLog EXTRA "Installing sstrip"
    2.73 +        CT_DoExecLog ALL install -m 755 sstrip "${CT_PREFIX_DIR}/bin/${CT_TARGET}-sstrip"
    2.74  
    2.75 -            CT_DoLog EXTRA "Installing sstrip"
    2.76 -            CT_DoExecLog ALL install -m 755 sstrip "${CT_PREFIX_DIR}/bin/${CT_TARGET}-sstrip"
    2.77 -
    2.78 -            CT_EndStep
    2.79 -        }
    2.80 -    ;;
    2.81 -esac
    2.82 +        CT_EndStep
    2.83 +    }
    2.84 +fi