tools: move sstrip to the binary utilities menu

sstrip is now alone in its 'tools' menu, and we will probably never gain
any other 'tool'. Besides, sstrip is just strip, but a little bit more
agressive, so it deserves going to the 'binary utilities' menu.

3 files changed, 10 insertions, 89 deletions

diff --git a/scripts/build/tools/200-sstrip.sh b/scripts/build/binutils/sstrip.sh
index c677072..56ed36f 100644
--- a/scripts/build/tools/200-sstrip.sh
+++ b/scripts/build/binutils/sstrip.sh
@@ -1,16 +1,20 @@
 # This will build and install sstrip to run on host and sstrip target files
 
+do_tools_sstrip_get() { :; }
+do_tools_sstrip_extract() { :; }
+do_tools_sstrip() { :; }
+
 case "${CT_SSTRIP_FROM}" in
     ELFkickers)
-        do_tools_sstrip_get() {
+        do_sstrip_get() {
             CT_GetFile "ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}"     \
                        http://www.muppetlabs.com/~breadbox/pub/software
         }
-        do_tools_sstrip_extract() {
+        do_sstrip_extract() {
             CT_Extract "ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}"
             CT_Patch "ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}"
         }
-        do_tools_sstrip_build() {
+        do_sstrip() {
             CT_DoStep INFO "Installing sstrip"
             CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/ELFkickers-${CT_SSTRIP_ELFKICKERS_VERSION}/sstrip"   \
                                     "${CT_BUILD_DIR}/build-strip"
@@ -27,10 +31,10 @@ case "${CT_SSTRIP_FROM}" in
     ;;
 
     buildroot)
-        do_tools_sstrip_get() {
+        do_sstrip_get() {
             CT_GetFile sstrip .c http://git.buildroot.net/buildroot/plain/toolchain/sstrip
         }
-        do_tools_sstrip_extract() {
+        do_sstrip_extract() {
             # We leave the sstrip maintenance to the buildroot people:
             # -> any fix-up goes directly there
             # -> we don't have patches for it
@@ -39,7 +43,7 @@ case "${CT_SSTRIP_FROM}" in
             CT_DoExecLog DEBUG mkdir -p "${CT_SRC_DIR}/sstrip"
             CT_DoExecLog DEBUG cp -v "${CT_TARBALLS_DIR}/sstrip.c" "${CT_SRC_DIR}/sstrip"
         }
-        do_tools_sstrip_build() {
+        do_sstrip() {
             CT_DoStep INFO "Installing sstrip"
             mkdir -p "${CT_BUILD_DIR}/build-sstrip"
             cd "${CT_BUILD_DIR}/build-sstrip"
@@ -53,15 +57,4 @@ case "${CT_SSTRIP_FROM}" in
             CT_EndStep
         }
     ;;
-
-    *)  do_tools_sstrip_get() {
-            :
-        }
-        do_tools_sstrip_extract() {
-            :
-        }
-        do_tools_sstrip_build() {
-            :
-        }
-    ;;
 esac
diff --git a/scripts/build/tools.sh b/scripts/build/tools.sh
deleted file mode 100644
index bb07c9a..0000000
--- a/scripts/build/tools.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-# Wrapper to build the tools facilities
-
-# List all tools facilities, and parse their scripts
-CT_TOOLS_FACILITY_LIST=
-for f in "${CT_LIB_DIR}/scripts/build/tools/"*.sh; do
-    _f="$(basename "${f}" .sh)"
-    _f="${_f#???-}"
-    __f="CT_TOOL_${_f}"
-    if [ "${!__f}" = "y" ]; then
-        CT_DoLog DEBUG "Enabling tool '${_f}'"
-        . "${f}"
-        CT_TOOLS_FACILITY_LIST="${CT_TOOLS_FACILITY_LIST} ${_f}"
-    else
-        CT_DoLog DEBUG "Disabling tool '${_f}'"
-    fi
-done
-
-# Download the tools facilities
-do_tools_get() {
-    for f in ${CT_TOOLS_FACILITY_LIST}; do
-        do_tools_${f}_get
-    done
-}
-
-# Extract and patch the tools facilities
-do_tools_extract() {
-    for f in ${CT_TOOLS_FACILITY_LIST}; do
-        do_tools_${f}_extract
-    done
-}
-
-# Build the tools facilities
-do_tools() {
-    for f in ${CT_TOOLS_FACILITY_LIST}; do
-        do_tools_${f}_build
-    done
-}
-
diff --git a/scripts/build/tools/000-template.sh b/scripts/build/tools/000-template.sh
deleted file mode 100644
index 032f289..0000000
--- a/scripts/build/tools/000-template.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for a tool utility
-
-# Put your download code here
-do_tools_foobar_get() {
-    # For example:
-    # CT_GetFile "foobar-${CT_FOOBAR_VERSION}" http://foobar.com/releases/
-    :
-}
-
-# Put your extract code here
-do_tools_foobar_extract() {
-    # For example:
-    # CT_Extract "foobar-${CT_FOOBAR_VERSION}"
-    # CT_Patch "foobar-${CT_FOOBAR_VERSION}"
-    :
-}
-
-# Put your build code here
-do_tools_foobar_build() {
-    # For example:
-    # mkdir -p "${CT_BUILD_DIR}/build-foobar"
-    # CT_Pushd "${CT_BUILD_DIR}/build-foobar"
-    # CT_DoExecLog ALL                                        \
-    # "${CT_SRC_DIR}/foobar-${CT_FOOBAR_VERSION}/configure"   \
-    #     --build=${CT_BUILD}                                 \
-    #     --host=${CT_TARGET}                                 \
-    #     --prefix=/usr                                       \
-    #     --foobar-options
-    # CT_DoExecLog ALL make
-    # CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" install
-    # CT_Popd
-    :
-}
-