Separate the notions of package name/label

Also, remove resolved TBDs.

Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2017-07-08 10:54:53 -07:00
parent af479f1053
commit 9d91f44bc8
7 changed files with 9 additions and 13 deletions

View File

@ -473,7 +473,8 @@ enter_fork()
info[repository_subdir]= info[repository_subdir]=
info[bootstrap]= info[bootstrap]=
info[fork]=${fork} info[fork]=${fork}
info[name]=${fork} info[pkg_name]=${fork}
info[pkg_label]=${fork}
info[mirrors]= info[mirrors]=
info[archive_filename]='@{pkg_name}-@{version}' info[archive_filename]='@{pkg_name}-@{version}'
info[archive_dirname]='@{pkg_name}-@{version}' info[archive_dirname]='@{pkg_name}-@{version}'

View File

@ -42,14 +42,14 @@ if @@masterpfx@@_USE_@@originpfx@@
config @@pfx@@_PKG_NAME config @@pfx@@_PKG_NAME
string string
default "@@name@@" default "@@pkg_name@@"
#!// If a project makes official releases, using "bleeding edge" #!// If a project makes official releases, using "bleeding edge"
#!// from a development repository is experimental. However, there #!// from a development repository is experimental. However, there
#!// are projects that consider its HEAD a "rolling release". For #!// are projects that consider its HEAD a "rolling release". For
#!// those, checking out from a repository is the regular method. #!// those, checking out from a repository is the regular method.
choice choice
bool "Source of @@name@@" bool "Source of @@pkg_label@@"
#!if [ -n "@@all_versions@@" ] #!if [ -n "@@all_versions@@" ]
config @@pfx@@_SRC_RELEASE config @@pfx@@_SRC_RELEASE
@ -78,7 +78,7 @@ choice
#!end-if #!end-if
help help
Version control system from which the sources will be checked out. 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 config @@pfx@@_DEVEL_VCS_git
bool "Git" bool "Git"
@ -191,13 +191,13 @@ config @@pfx@@_ARCHIVE_DIRNAME
#!// #!//
#!if [ -n "@@all_versions@@" -a -z "@@versionlocked@@" ] #!if [ -n "@@all_versions@@" -a -z "@@versionlocked@@" ]
choice choice
bool "Version of @@name@@" bool "Version of @@pkg_label@@"
help 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 and build. For sources out of the vendor repository or from a custom
location, select the version that describes those custom sources. location, select the version that describes those custom sources.
Based on this version, crosstool-NG may apply some version-specific Based on this version, crosstool-NG may apply some version-specific
quirks while building @@name@@. quirks while building @@pkg_label@@.
config @@pfx@@_VERY_NEW config @@pfx@@_VERY_NEW
bool "newer than anything below" bool "newer than anything below"

View File

@ -1,4 +1,4 @@
name='CLooG' pkg_label='CLooG'
repository='git git://repo.or.cz/cloog.git' repository='git git://repo.or.cz/cloog.git'
mirrors='http://www.bastoul.net/cloog/pages/download ftp://gcc.gnu.org/pub/gcc/infrastructure' mirrors='http://www.bastoul.net/cloog/pages/download ftp://gcc.gnu.org/pub/gcc/infrastructure'
milestones='0.18 0.18.1 0.18.4' milestones='0.18 0.18.1 0.18.4'

View File

@ -12,7 +12,6 @@ do_binutils_get() {
# Extract binutils # Extract binutils
do_binutils_extract() { do_binutils_extract() {
# TBD handle xtensa overlays in CT_ExtractPatch
CT_ExtractPatch BINUTILS CT_ExtractPatch BINUTILS
if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then
CT_ExtractPatch ELF2FLT CT_ExtractPatch ELF2FLT

View File

@ -5,7 +5,6 @@ do_debug_gdb_get() {
} }
do_debug_gdb_extract() { do_debug_gdb_extract() {
# TBD xtensa overlays
CT_ExtractPatch GDB CT_ExtractPatch GDB
} }

View File

@ -10,7 +10,6 @@ do_libc_get() {
} }
do_libc_extract() { do_libc_extract() {
# TBD xtensa overlays
CT_ExtractPatch NEWLIB CT_ExtractPatch NEWLIB
} }

View File

@ -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_NEWLIB_V_/CT_NEWLIB_V_/g
s/\<CT_LIBC_UCLIBC_NG_V_/CT_UCLIBC_NG_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) # 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_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 s/\<CT_[A-Za-z0-9_]*_SHOW_LINARO.*/# [&] not handled by upgrade script, use menuconfig./w/dev/stderr