Separate the notions of package name/label

Also, remove resolved TBDs.

Signed-off-by: Alexey Neyman <stilor@att.net>

7 files changed, 9 insertions, 13 deletions

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/\<CT_LIBC_MUSL_V_/CT_MUSL_V_/g
 s/\<CT_LIBC_NEWLIB_V_/CT_NEWLIB_V_/g
 s/\<CT_LIBC_UCLIBC_NG_V_/CT_UCLIBC_NG_V_/g
 
-# TBD add some way to ignore fast-changing parts, such as patchlevel in Linux or patchdate in newlib?
-
 # Special cases that need manual intervention (require setting of supporting options)
 s/\<CT_LIBC_UCLIBC_V_.*/# [&] not handled by upgrade script, use menuconfig./w/dev/stderr
 s/\<CT_[A-Za-z0-9_]*_SHOW_LINARO.*/# [&] not handled by upgrade script, use menuconfig./w/dev/stderr