From 567277099a487508fd228a4c56f3583db3fa96c9 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Mon, 29 May 2017 22:32:38 -0700 Subject: Fix the references to old config variables Signed-off-by: Alexey Neyman --- scripts/build/debug/200-duma.sh | 20 ++++---------------- scripts/build/debug/300-gdb.sh | 37 ++++++++----------------------------- scripts/build/debug/400-ltrace.sh | 15 +++------------ scripts/build/debug/500-strace.sh | 10 +++------- 4 files changed, 18 insertions(+), 64 deletions(-) (limited to 'scripts/build/debug') diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh index 2a9b01f8..afaeb027 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 e5276d0f..cdc70474 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 6b860e92..ce299c2e 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 6eb23579..cb4643af 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 -- cgit v1.2.3 From 9d91f44bc8d973d40b1cd972464a7fd93bddfe35 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 8 Jul 2017 10:54:53 -0700 Subject: Separate the notions of package name/label Also, remove resolved TBDs. Signed-off-by: Alexey Neyman --- bootstrap | 3 ++- maintainer/kconfig-versions.template | 12 ++++++------ packages/cloog/package.desc | 2 +- scripts/build/binutils/binutils.sh | 1 - scripts/build/debug/300-gdb.sh | 1 - scripts/build/libc/newlib.sh | 1 - scripts/upgrade.sed | 2 -- 7 files changed, 9 insertions(+), 13 deletions(-) (limited to 'scripts/build/debug') diff --git a/bootstrap b/bootstrap index d37a8d21..e32feaa1 100755 --- a/bootstrap +++ b/bootstrap @@ -473,7 +473,8 @@ enter_fork() info[repository_subdir]= info[bootstrap]= info[fork]=${fork} - info[name]=${fork} + info[pkg_name]=${fork} + info[pkg_label]=${fork} info[mirrors]= info[archive_filename]='@{pkg_name}-@{version}' info[archive_dirname]='@{pkg_name}-@{version}' diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template index af78f3cb..e7e01212 100644 --- a/maintainer/kconfig-versions.template +++ b/maintainer/kconfig-versions.template @@ -42,14 +42,14 @@ if @@masterpfx@@_USE_@@originpfx@@ config @@pfx@@_PKG_NAME string - default "@@name@@" + default "@@pkg_name@@" #!// If a project makes official releases, using "bleeding edge" #!// from a development repository is experimental. However, there #!// are projects that consider its HEAD a "rolling release". For #!// those, checking out from a repository is the regular method. choice - bool "Source of @@name@@" + bool "Source of @@pkg_label@@" #!if [ -n "@@all_versions@@" ] config @@pfx@@_SRC_RELEASE @@ -78,7 +78,7 @@ choice #!end-if help Version control system from which the sources will be checked out. - The default value points to the development repository for @@name@@. + The default value points to the development repository for @@pkg_label@@. config @@pfx@@_DEVEL_VCS_git bool "Git" @@ -191,13 +191,13 @@ config @@pfx@@_ARCHIVE_DIRNAME #!// #!if [ -n "@@all_versions@@" -a -z "@@versionlocked@@" ] choice - bool "Version of @@name@@" + bool "Version of @@pkg_label@@" help - For a released version, select the version of @@name@@ to download + For a released version, select the version of @@pkg_label@@ to download and build. For sources out of the vendor repository or from a custom location, select the version that describes those custom sources. Based on this version, crosstool-NG may apply some version-specific - quirks while building @@name@@. + quirks while building @@pkg_label@@. config @@pfx@@_VERY_NEW bool "newer than anything below" diff --git a/packages/cloog/package.desc b/packages/cloog/package.desc index 76252ae2..333a45c6 100644 --- a/packages/cloog/package.desc +++ b/packages/cloog/package.desc @@ -1,4 +1,4 @@ -name='CLooG' +pkg_label='CLooG' repository='git git://repo.or.cz/cloog.git' mirrors='http://www.bastoul.net/cloog/pages/download ftp://gcc.gnu.org/pub/gcc/infrastructure' milestones='0.18 0.18.1 0.18.4' diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh index d229a537..8fb51b8d 100644 --- a/scripts/build/binutils/binutils.sh +++ b/scripts/build/binutils/binutils.sh @@ -12,7 +12,6 @@ do_binutils_get() { # Extract binutils do_binutils_extract() { - # TBD handle xtensa overlays in CT_ExtractPatch CT_ExtractPatch BINUTILS if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then CT_ExtractPatch ELF2FLT diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index cdc70474..19d9d6dc 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -5,7 +5,6 @@ do_debug_gdb_get() { } do_debug_gdb_extract() { - # TBD xtensa overlays CT_ExtractPatch GDB } diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh index 05f98307..5c4a3562 100644 --- a/scripts/build/libc/newlib.sh +++ b/scripts/build/libc/newlib.sh @@ -10,7 +10,6 @@ do_libc_get() { } do_libc_extract() { - # TBD xtensa overlays CT_ExtractPatch NEWLIB } diff --git a/scripts/upgrade.sed b/scripts/upgrade.sed index 2a05192c..995b804e 100644 --- a/scripts/upgrade.sed +++ b/scripts/upgrade.sed @@ -19,8 +19,6 @@ s/\ Date: Sun, 9 Jul 2017 23:08:12 -0700 Subject: Resolve a few more TBDs Signed-off-by: Alexey Neyman --- bootstrap | 2 -- packages/binutils/package.desc | 2 +- packages/gcc/package.desc | 2 +- packages/gdb/package.desc | 2 +- packages/glibc-ports/package.desc | 2 +- packages/glibc/package.desc | 2 +- scripts/build/cc/gcc.sh | 9 +++++---- scripts/build/debug/200-duma.sh | 1 - scripts/functions | 7 +++---- 9 files changed, 13 insertions(+), 16 deletions(-) (limited to 'scripts/build/debug') diff --git a/bootstrap b/bootstrap index e32feaa1..f5784cd5 100755 --- a/bootstrap +++ b/bootstrap @@ -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 ae3d2f15..4591f7c7 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 c38ead7e..dc49186e 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 c23c701e..e6120f24 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 5df2f20c..4f7e7ac0 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 f6cc8e24..13e2233c 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 2f0d3f79..6019b35a 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 afaeb027..bd350304 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 a7dd5412..79b7321b 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}}\"" -- cgit v1.2.3