Fix the references to old config variables

Signed-off-by: Alexey Neyman <stilor@att.net>

4 files changed, 18 insertions, 64 deletions

diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh
index 2a9b01f..afaeb02 100644
--- a/scripts/build/debug/200-duma.sh
+++ b/scripts/build/debug/200-duma.sh
@@ -1,24 +1,12 @@
 # Build script for D.U.M.A.
 
 do_debug_duma_get() {
-    local dl_base
-
-    dl_base="http://downloads.sourceforge.net/project/duma/duma"
-    dl_base+="/${CT_DUMA_VERSION//_/.}"
-
-    # Downloading an non-existing file from sourceforge will give you an
-    # HTML file containing an error message, instead of returning a 404.
-    # Sigh...
-    CT_GetFile "duma_${CT_DUMA_VERSION}" .tar.gz "${dl_base}"
-    # Downloading from sourceforge may leave garbage, cleanup
-    CT_DoExecLog ALL rm -f "${CT_TARBALLS_DIR}/showfiles.php"*
+    # TBD need cleanup after sourceforge.net download?
+    CT_Fetch DUMA
 }
 
 do_debug_duma_extract() {
-    CT_Extract "duma_${CT_DUMA_VERSION}"
-    CT_Pushd "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}"
-    CT_Patch nochdir "duma" "${CT_DUMA_VERSION}"
-    CT_Popd
+    CT_ExtractPatch DUMA
 }
 
 do_debug_duma_build() {
@@ -26,7 +14,7 @@ do_debug_duma_build() {
 
     CT_DoStep INFO "Installing D.U.M.A."
     CT_DoLog EXTRA "Copying sources"
-    cp -a "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}/." "${CT_BUILD_DIR}/build-duma"
+    cp -a "${CT_SRC_DIR}/duma/." "${CT_BUILD_DIR}/build-duma"
     CT_Pushd "${CT_BUILD_DIR}/build-duma"
 
     make_args=(
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index e5276d0..cdc7047 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -1,40 +1,18 @@
 # Build script for the gdb debug facility
 
 do_debug_gdb_get() {
-    local linaro_version=""
-    local linaro_series=""
-
-    if [ "${CT_GDB_CUSTOM}" = "y" ]; then
-        CT_GetCustom "gdb" "${CT_GDB_CUSTOM_VERSION}" \
-            "${CT_GDB_CUSTOM_LOCATION}"
-    else
-        case "${CT_GDB_VERSION}" in
-            linaro-*)
-                CT_GetLinaro "gdb" "${CT_GDB_VERSION}"
-                ;;
-            *)
-                CT_GetFile "gdb-${CT_GDB_VERSION}"                             \
-                           http://mirrors.kernel.org/sourceware/gdb            \
-                           {http,ftp,https}://ftp.gnu.org/pub/gnu/gdb          \
-                           ftp://{sourceware.org,gcc.gnu.org}/pub/gdb/releases
-                ;;
-        esac
-    fi
+    CT_Fetch GDB
 }
 
 do_debug_gdb_extract() {
-    CT_Extract "gdb-${CT_GDB_VERSION}"
-    CT_Patch "gdb" "${CT_GDB_VERSION}"
-
-    if [ -n "${CT_ARCH_XTENSA_CUSTOM_NAME}" ]; then
-        CT_ConfigureXtensa "gdb" "${CT_GDB_VERSION}"
-    fi
+    # TBD xtensa overlays
+    CT_ExtractPatch GDB
 }
 
 do_debug_gdb_build() {
     local -a extra_config
 
-    gdb_src_dir="${CT_SRC_DIR}/gdb-${CT_GDB_VERSION}"
+    gdb_src_dir="${CT_SRC_DIR}/gdb"
 
     # Version 6.3 and below behave badly with gdbmi
     case "${CT_GDB_VERSION}" in
@@ -174,11 +152,12 @@ do_debug_gdb_build() {
         if [ "${CT_GDB_INSTALL_GDBINIT}" = "y" ]; then
             CT_DoLog EXTRA "Installing '.gdbinit' template"
             # See in scripts/build/internals.sh for why we do this
-            if [ -f "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/BASE-VER" ]; then
-                gcc_version=$( cat "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/BASE-VER" )
+            # TBD GCC 3.x and older not supported
+            if [ -f "${CT_SRC_DIR}/gcc/gcc/BASE-VER" ]; then
+                gcc_version=$( cat "${CT_SRC_DIR}/gcc/gcc/BASE-VER" )
             else
                 gcc_version=$(sed -r -e '/version_string/!d; s/^.+= "([^"]+)".*$/\1/;'   \
-                                   "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/version.c"   \
+                                   "${CT_SRC_DIR}/gcc/gcc/version.c"   \
                              )
             fi
             sed -r                                               \
diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh
index 6b860e9..ce299c2 100644
--- a/scripts/build/debug/400-ltrace.sh
+++ b/scripts/build/debug/400-ltrace.sh
@@ -1,19 +1,11 @@
 # Build script for ltrace
 
 do_debug_ltrace_get() {
-    CT_GetFile "ltrace_${CT_LTRACE_VERSION}.orig" .tar.gz               \
-               {http,ftp}://ftp.debian.org/debian/pool/main/l/ltrace/
-    # Create a link so that the following steps are easier to do:
-    CT_Pushd "${CT_TARBALLS_DIR}"
-    ltrace_ext=$(CT_GetFileExtension "ltrace_${CT_LTRACE_VERSION}.orig")
-    ln -sf "ltrace_${CT_LTRACE_VERSION}.orig${ltrace_ext}"              \
-           "ltrace-${CT_LTRACE_VERSION}${ltrace_ext}"
-    CT_Popd
+    CT_Fetch LTRACE
 }
 
 do_debug_ltrace_extract() {
-    CT_Extract "ltrace-${CT_LTRACE_VERSION}"
-    CT_Patch "ltrace" "${CT_LTRACE_VERSION}"
+    CT_ExtractPatch LTRACE
 }
 
 do_debug_ltrace_build() {
@@ -22,7 +14,7 @@ do_debug_ltrace_build() {
     CT_DoStep INFO "Installing ltrace"
 
     CT_DoLog EXTRA "Copying sources to build dir"
-    CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/ltrace-${CT_LTRACE_VERSION}/." \
+    CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/ltrace/." \
                             "${CT_BUILD_DIR}/build-ltrace"
     CT_Pushd "${CT_BUILD_DIR}/build-ltrace"
 
@@ -63,4 +55,3 @@ do_debug_ltrace_build() {
     CT_Popd
     CT_EndStep
 }
-
diff --git a/scripts/build/debug/500-strace.sh b/scripts/build/debug/500-strace.sh
index 6eb2357..cb4643a 100644
--- a/scripts/build/debug/500-strace.sh
+++ b/scripts/build/debug/500-strace.sh
@@ -1,15 +1,11 @@
 # Build script for strace
 
 do_debug_strace_get() {
-    local base_url="http://downloads.sourceforge.net/project/strace/strace"
-    CT_GetFile "strace-${CT_STRACE_VERSION}" "${base_url}/${CT_STRACE_VERSION}"
-    # Downloading from sourceforge leaves garbage, cleanup
-    CT_DoExecLog ALL rm -f "${CT_TARBALLS_DIR}/showfiles.php"*
+    CT_Fetch STRACE
 }
 
 do_debug_strace_extract() {
-    CT_Extract "strace-${CT_STRACE_VERSION}"
-    CT_Patch "strace" "${CT_STRACE_VERSION}"
+    CT_ExtractPatch STRACE
 }
 
 do_debug_strace_build() {
@@ -23,7 +19,7 @@ do_debug_strace_build() {
     CPP="${CT_TARGET}-cpp"                                     \
     LD="${CT_TARGET}-ld"                                       \
     ${CONFIG_SHELL}                                            \
-    "${CT_SRC_DIR}/strace-${CT_STRACE_VERSION}/configure"      \
+    "${CT_SRC_DIR}/strace/configure"                           \
         --build=${CT_BUILD}                                    \
         --host=${CT_TARGET}                                    \
         --prefix=/usr