scripts/functions: make CT_Patch dumber

It is the responsibility of the caller to split the package name from
its version. It already knows that.

6 files changed, 8 insertions, 12 deletions

diff --git a/scripts/build/debug/000-template.sh b/scripts/build/debug/000-template.sh
index 793d786..c76c972 100644
--- a/scripts/build/debug/000-template.sh
+++ b/scripts/build/debug/000-template.sh
@@ -11,7 +11,7 @@ do_debug_foobar_get() {
 do_debug_foobar_extract() {
     # For example:
     # CT_Extract "foobar-${CT_FOOBAR_VERSION}"
-    # CT_Patch "foobar-${CT_FOOBAR_VERSION}"
+    # CT_Patch "foobar" "${CT_FOOBAR_VERSION}"
     :
 }
 
diff --git a/scripts/build/debug/100-dmalloc.sh b/scripts/build/debug/100-dmalloc.sh
index e8965e9..c567c40 100644
--- a/scripts/build/debug/100-dmalloc.sh
+++ b/scripts/build/debug/100-dmalloc.sh
@@ -6,7 +6,7 @@ do_debug_dmalloc_get() {
 
 do_debug_dmalloc_extract() {
     CT_Extract "dmalloc-${CT_DMALLOC_VERSION}"
-    CT_Patch "dmalloc-${CT_DMALLOC_VERSION}"
+    CT_Patch "dmalloc" "${CT_DMALLOC_VERSION}"
 }
 
 do_debug_dmalloc_build() {
diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh
index de0c5c1..fe47b5e 100644
--- a/scripts/build/debug/200-duma.sh
+++ b/scripts/build/debug/200-duma.sh
@@ -12,11 +12,7 @@ do_debug_duma_get() {
 do_debug_duma_extract() {
     CT_Extract "duma_${CT_DUMA_VERSION}"
     CT_Pushd "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}"
-    # Even if DUMA uses _ and not -, crosstool-NG uses the dash to split the
-    # name from the version in order to find the appropriate patches
-    # YEM: FIXME: make CT_Patch more intelligent, Eg.: CT_Patch duma _ "${CT_DUMA_VERSION}"
-    CT_DoExecLog DEBUG touch "${CT_SRC_DIR}/.duma-${CT_DUMA_VERSION}.extracted"
-    CT_Patch nochdir "duma-${CT_DUMA_VERSION}"
+    CT_Patch nochdir "duma" "${CT_DUMA_VERSION}"
     CT_Popd
 }
 
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index da6002f..49810c6 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -57,17 +57,17 @@ do_debug_gdb_extract() {
 
     if [ "${do_gdb}" = "y" ]; then
         CT_Extract "gdb-${CT_GDB_VERSION}"
-        CT_Patch "gdb-${CT_GDB_VERSION}"
+        CT_Patch "gdb" "${CT_GDB_VERSION}"
     fi
 
     if [ "${do_insight}" = "y" ]; then
         CT_Extract "insight-${CT_GDB_VERSION}"
-        CT_Patch "insight-${CT_GDB_VERSION}"
+        CT_Patch "insight" "${CT_GDB_VERSION}"
     fi
 
     if [ "${do_ncurses}" = "y" ]; then
         CT_Extract "ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}"
-        CT_Patch "ncurses-${CT_DEBUG_GDB_NCURSES_VERSION}"
+        CT_Patch "ncurses" "${CT_DEBUG_GDB_NCURSES_VERSION}"
     fi
 }
 
diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh
index f09277d..dd0fe4a 100644
--- a/scripts/build/debug/400-ltrace.sh
+++ b/scripts/build/debug/400-ltrace.sh
@@ -13,7 +13,7 @@ do_debug_ltrace_get() {
 
 do_debug_ltrace_extract() {
     CT_Extract "ltrace-${CT_LTRACE_VERSION}"
-    CT_Patch "ltrace-${CT_LTRACE_VERSION}"
+    CT_Patch "ltrace" "${CT_LTRACE_VERSION}"
 }
 
 do_debug_ltrace_build() {
diff --git a/scripts/build/debug/500-strace.sh b/scripts/build/debug/500-strace.sh
index 174c8dc..3713da5 100644
--- a/scripts/build/debug/500-strace.sh
+++ b/scripts/build/debug/500-strace.sh
@@ -8,7 +8,7 @@ do_debug_strace_get() {
 
 do_debug_strace_extract() {
     CT_Extract "strace-${CT_STRACE_VERSION}"
-    CT_Patch "strace-${CT_STRACE_VERSION}"
+    CT_Patch "strace" "${CT_STRACE_VERSION}"
 }
 
 do_debug_strace_build() {