From 35f55a749584be11c424cc9bda779283d326dfff Mon Sep 17 00:00:00 2001 From: David Holsgrove Date: Thu, 11 Oct 2012 14:39:42 +1000 Subject: debug/gdb: Add CUSTOM version and CUSTOM_LOCATION config options and GetCustom CUSTOM_LOCATION config options only presented in menuconfig if component CUSTOM version selected. Signed-off-by: "David Holsgrove" [yann.morin.1998@free.fr: don't patch custom dir location] Signed-off-by: "Yann E. MORIN" Message-Id: <9ea1b5021fc77582867f.1349931197@localhost.localdomain> PatchWork-Id: 190791 --- scripts/build/debug/300-gdb.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'scripts/build/debug') diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index d1839c5c..22fcfece 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -48,10 +48,14 @@ do_debug_gdb_get() { do_debug_gdb_parts if [ "${do_gdb}" = "y" ]; then - CT_GetFile "gdb-${CT_GDB_VERSION}" \ - {ftp,http}://ftp.gnu.org/pub/gnu/gdb \ - ftp://sources.redhat.com/pub/gdb/{,old-}releases \ - "${linaro_base_url}/${linaro_series}/${linaro_version}/+download" + if [ "${CT_GDB_CUSTOM}" = "y" ]; then + CT_GetCustom "gdb" "${CT_GDB_VERSION}" "${CT_GDB_CUSTOM_LOCATION}" + else + CT_GetFile "gdb-${CT_GDB_VERSION}" \ + {ftp,http}://ftp.gnu.org/pub/gnu/gdb \ + ftp://sources.redhat.com/pub/gdb/{,old-}releases \ + "${linaro_base_url}/${linaro_series}/${linaro_version}/+download" + fi fi if [ "${do_ncurses}" = "y" ]; then @@ -70,6 +74,11 @@ do_debug_gdb_extract() { do_debug_gdb_parts if [ "${do_gdb}" = "y" ]; then + # If using custom directory location, nothing to do + if [ "${CT_GDB_CUSTOM}" = "y" \ + -a -d "${CT_SRC_DIR}/gdb-${CT_GDB_VERSION}" ]; then + return 0 + fi CT_Extract "gdb-${CT_GDB_VERSION}" CT_Patch "gdb" "${CT_GDB_VERSION}" fi -- cgit v1.2.3