[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-498-geda687f

[Lawrence S. <ljs...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".

The branch, master has been updated
       via  eda687f373dbc489b235f6536883c20471e0b882 (commit)
       via  29929ddfd50e073d9633c589a899b60bc345fc1c (commit)
      from  2b200fb8aa4c37f259c5837a6fec13ca4bd966ef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit eda687f373dbc489b235f6536883c20471e0b882
Merge: 2b200fb 29929dd
Author: Lawrence Sebald <ljs...@us...>
Date:   Mon May 3 20:44:40 2021 -0400

    Merge pull request #52 from 7dog123/master
    
    Fix download of ARM binutils version if it is different from SH binutils version.

commit 29929ddfd50e073d9633c589a899b60bc345fc1c
Author: 7dog123 <fut...@gm...>
Date:   Mon May 3 11:34:40 2021 -0500

    Binutils arm will now properly be downloaded.

-----------------------------------------------------------------------

Summary of changes:
 utils/dc-chain/download.sh       | 2 +-
 utils/dc-chain/scripts/common.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/dc-chain/download.sh b/utils/dc-chain/download.sh
index 34b0870..1541dc8 100755
--- a/utils/dc-chain/download.sh
+++ b/utils/dc-chain/download.sh
@@ -77,7 +77,7 @@ if [ -z "${CONFIG_GUESS_ONLY}" ]; then
   download "Newlib" "$NEWLIB_VER" "$NEWLIB_URL"
 
   # Downloading ARM components
-  download "Binutils" $ARM_BINUTILS_VER"" "$ARM_BINUTILS_URL"
+  download "Binutils" "$ARM_BINUTILS_VER" "$ARM_BINUTILS_URL"
   download "GCC" "$ARM_GCC_VER" "$ARM_GCC_URL"
   download_dependencies "arm"
 fi
diff --git a/utils/dc-chain/scripts/common.sh b/utils/dc-chain/scripts/common.sh
index 68f2256..baf75db 100755
--- a/utils/dc-chain/scripts/common.sh
+++ b/utils/dc-chain/scripts/common.sh
@@ -63,7 +63,7 @@ export SH_GCC_URL=ftp.gnu.org/gnu/gcc/gcc-${SH_GCC_VER}/gcc-${SH_GCC_VER}.tar.${
 export NEWLIB_URL=sourceware.org/pub/newlib/newlib-${NEWLIB_VER}.tar.${NEWLIB_TARBALL_TYPE}
 export GDB_URL=ftp.gnu.org/gnu/gdb/gdb-${GDB_VER}.tar.${GDB_TARBALL_TYPE}
 export INSIGHT_URL=mirrors.kernel.org/sourceware/insight/releases/insight-${INSIGHT_VER}a.tar.${INSIGHT_TARBALL_TYPE}
-export ARM_BINUTILS_URL=ftp.gnu.org/gnu/binutils/binutils-${SH_BINUTILS_VER}.tar.${SH_BINUTILS_TARBALL_TYPE}
+export ARM_BINUTILS_URL=ftp.gnu.org/gnu/binutils/binutils-${ARM_BINUTILS_VER}.tar.${ARM_BINUTILS_TARBALL_TYPE}
 export ARM_GCC_URL=ftp.gnu.org/gnu/gcc/gcc-${ARM_GCC_VER}/gcc-${ARM_GCC_VER}.tar.${ARM_GCC_TARBALL_TYPE}
 
 export DOWNLOAD_PROTOCOL="`get_make_var download_protocol`://"


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.