Fixes for building

- Need GDB8.0 milestone
- Make uClibc "master" package
- Rename bionic -> android-ndk to match the package name and
  support suffixes for archives

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

2 files changed, 17 insertions, 6 deletions

diff --git a/maintainer/gen-versions.sh b/maintainer/gen-versions.sh
index 099cdaea..8144b62c 100755
--- a/maintainer/gen-versions.sh
+++ b/maintainer/gen-versions.sh
@@ -201,7 +201,7 @@ config_dir=config/versions
 template=maintainer/kconfig-versions.template
 
 declare -A pkg_forks pkg_milestones pkg_nforks
-declare -a pkg_masters pkg_all
+declare -a pkg_masters pkg_all pkg_preferred
 
 # Convert the argument to a Kconfig-style macro
 kconfigize()
@@ -406,17 +406,23 @@ find_forks()
 {
     local -A info
 
+    info[preferred]=${1}
     eval `read_package_desc ${1}`
 
     if [ -n "${info[master]}" ]; then
         pkg_nforks[${info[master]}]=$[pkg_nforks[${info[master]}]+1]
-        pkg_forks[${info[master]}]+=" ${1}"
+        pkg_forks[${info[master]}]+=" ${1} "
     else
+        pkg_preferred[${1}]=${info[preferred]}
         pkg_nforks[${1}]=$[pkg_nforks[${1}]+1]
-        pkg_forks[${1}]="${1}${pkg_forks[${1}]}"
+        pkg_forks[${1}]+=" ${1} "
         pkg_milestones[${1}]=`sort_versions ${info[milestones]}`
         pkg_masters+=( "${1}" )
     fi
+    # Keep sorting so that preferred fork is first
+    if [ -n "${pkg_preferred[${1}]}" ]; then
+        pkg_forks[${1}]="${pkg_preferred[${1}]} ${pkg_forks[${1}]##* ${pkg_preferred[${1}]} } ${pkg_forks[${1}]%% ${pkg_preferred[${1}]} *}"
+    fi
 }
 
 check_obsolete_experimental()
@@ -442,15 +448,16 @@ enter_fork()
     info[fork]=${fork}
     info[name]=${fork}
     info[mirrors]=
+    info[archivesuffix]=
 
     eval `read_package_desc ${fork}`
 
     info[pfx]=`kconfigize ${fork}`
     info[originpfx]=`kconfigize ${info[origin]}`
     if [ -r "packages/${info[origin]}.help" ]; then
-        info[originhelp]=`sed 's/^/\t  /' "packages/${info[origin]}.help"`
+        info[originhelp]=`sed 's/^/      /' "packages/${info[origin]}.help"`
     else
-        info[originhelp]="${info[master]} from ${info[origin]}."
+        info[originhelp]="      ${info[master]} from ${info[origin]}."
     fi
 
     if [ -n "${info[repository]}" ]; then
@@ -467,7 +474,7 @@ enter_fork()
     info[all_versions]=${versions}
 
     # If a fork does not define any versions at all ("rolling release"), do not
-    # consider it obsolete/experimental unless it is marked in the fork's
+    # consider it obsolete/experimental unless it is so marked in the fork's
     # description.
     if [ -n "${versions}" ]; then
         only_obsolete=yes
diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template
index c1350914..c7ab461f 100644
--- a/maintainer/kconfig-versions.template
+++ b/maintainer/kconfig-versions.template
@@ -172,6 +172,10 @@ config @@pfx@@_MIRRORS
     string
     default "@@mirrors@@"
 
+config @@pfx@@_ARCHIVE_SUFFIX
+    string
+    default "@@archivesuffix@@"
+
 #!end-if
 
 #!// Below, we explicitly select all milestones to which a given version