diff options
| -rwxr-xr-x | bootstrap | 2 | ||||
| -rw-r--r-- | packages/binutils/package.desc | 2 | ||||
| -rw-r--r-- | packages/gcc/package.desc | 2 | ||||
| -rw-r--r-- | packages/gdb/package.desc | 2 | ||||
| -rw-r--r-- | packages/glibc-ports/package.desc | 2 | ||||
| -rw-r--r-- | packages/glibc/package.desc | 2 | ||||
| -rw-r--r-- | scripts/build/cc/gcc.sh | 9 | ||||
| -rw-r--r-- | scripts/build/debug/200-duma.sh | 1 | ||||
| -rw-r--r-- | scripts/functions | 7 |
9 files changed, 13 insertions, 16 deletions
@@ -605,8 +605,6 @@ enter_choice() local choice="${1}" local l - # TBD generate sourcing of versions/$component.in automatically - and add a comment - # TBD that versions must be generated first? [what to do with glibc/glibc-ports] info[choice]="${choice}" info[kcfg_choice]=`kconfigize "${choice}"` diff --git a/packages/binutils/package.desc b/packages/binutils/package.desc index ae3d2f1..4591f7c 100644 --- a/packages/binutils/package.desc +++ b/packages/binutils/package.desc @@ -1,4 +1,4 @@ repository='git git://sourceware.org/git/binutils-gdb.git' -mirrors='$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware)' +mirrors='$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware/releases)' origin='GNU' milestones='2.23' diff --git a/packages/gcc/package.desc b/packages/gcc/package.desc index c38ead7..dc49186 100644 --- a/packages/gcc/package.desc +++ b/packages/gcc/package.desc @@ -1,4 +1,4 @@ repository='svn svn://gcc.gnu.org/svn/gcc' -mirrors='$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc gcc-${CT_GCC_VERSION})' +mirrors='$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})' origin='GNU' milestones='4.8 4.9 4.9.2 5 6 7' diff --git a/packages/gdb/package.desc b/packages/gdb/package.desc index c23c701..e6120f2 100644 --- a/packages/gdb/package.desc +++ b/packages/gdb/package.desc @@ -1,4 +1,4 @@ origin='GNU' repository='git git://sourceware.org/git/binutils-gdb.git' -mirrors='$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb)' +mirrors='$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)' milestones='7.0 7.2 8.0' diff --git a/packages/glibc-ports/package.desc b/packages/glibc-ports/package.desc index 5df2f20..4f7e7ac 100644 --- a/packages/glibc-ports/package.desc +++ b/packages/glibc-ports/package.desc @@ -2,7 +2,7 @@ # the ports were an external add-on, it used a separate repository # and separate tarballs. repository='git git://sourceware.org/git/glibc-ports.git' -mirrors='$(CT_Mirrors GNU glibc) $(CT_Mirrors sourceware glibc)' +mirrors='$(CT_Mirrors GNU glibc) $(CT_Mirrors sourceware glibc/releases)' # Version of this package must be the same as the glibc's versionlocked='glibc' diff --git a/packages/glibc/package.desc b/packages/glibc/package.desc index f6cc8e2..13e2233 100644 --- a/packages/glibc/package.desc +++ b/packages/glibc/package.desc @@ -1,4 +1,4 @@ origin='GNU' repository='git git://sourceware.org/git/glibc.git' -mirrors='$(CT_Mirrors GNU glibc) $(CT_Mirrors sourceware glibc)' +mirrors='$(CT_Mirrors GNU glibc) $(CT_Mirrors sourceware glibc/releases)' milestones='2.17 2.20 2.23' diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index 2f0d3f7..6019b35 100644 --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -14,10 +14,11 @@ do_cc_get() { # GCC source tree, which will not be there unless we get it and # put it there ourselves if [ "${CT_CC_LANG_JAVA_USE_ECJ}" = "y" ]; then - # TBD check return code - CT_GetFile ecj-latest .jar http://mirrors.kernel.org/sourceware/java/ \ - ftp://gcc.gnu.org/pub/java \ - ftp://sourceware.org/pub/java + if ! CT_GetFile ecj-latest .jar $(CT_Mirrors sourceware java); then + # Should be a package, too - but with Java retirement in GCC, + # it may not make sense. + CT_Abort "Failed to download ecj-latest.jar" + fi fi } diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh index afaeb02..bd35030 100644 --- a/scripts/build/debug/200-duma.sh +++ b/scripts/build/debug/200-duma.sh @@ -1,7 +1,6 @@ # Build script for D.U.M.A. do_debug_duma_get() { - # TBD need cleanup after sourceforge.net download? CT_Fetch DUMA } diff --git a/scripts/functions b/scripts/functions index a7dd541..79b7321 100644 --- a/scripts/functions +++ b/scripts/functions @@ -1460,10 +1460,9 @@ CT_Mirrors() echo "ftp://ftp.gnu.org/gnu/${project}" ;; sourceware) - local subdir="${3:+/${3}}" - echo "ftp://sourceware.org/pub/${project}/releases${subdir}" - echo "http://mirrors.kernel.org/sourceware/${project}/releases${subdir}" - echo "http://gcc.gnu.org/pub/${project}/releases${subdir}" + echo "ftp://sourceware.org/pub/${project}" + echo "http://mirrors.kernel.org/sourceware/${project}" + echo "http://gcc.gnu.org/pub/${project}" ;; Linaro) eval "local version=\"\${${3}}\"" |