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>

11 files changed, 7 insertions, 6 deletions

diff --git a/packages/bionic/package.desc b/packages/android-ndk/package.desc
index 6e3d374..a422ee8 100644
--- a/packages/bionic/package.desc
+++ b/packages/android-ndk/package.desc
@@ -1,2 +1,3 @@
 # We don't support building bionic (yet) so no official repository
+archivesuffix='-linux-x86_64'
 mirrors='https://dl.google.com/android/repository'
diff --git a/packages/bionic/13b/version.desc b/packages/android-ndk/r10e/version.desc
index fcfe389..fcfe389 100644
--- a/packages/bionic/13b/version.desc
+++ b/packages/android-ndk/r10e/version.desc
diff --git a/packages/bionic/12b/version.desc b/packages/android-ndk/r11c/version.desc
index fcfe389..fcfe389 100644
--- a/packages/bionic/12b/version.desc
+++ b/packages/android-ndk/r11c/version.desc
diff --git a/packages/bionic/11c/version.desc b/packages/android-ndk/r12b/version.desc
index fcfe389..fcfe389 100644
--- a/packages/bionic/11c/version.desc
+++ b/packages/android-ndk/r12b/version.desc
diff --git a/packages/bionic/10e/version.desc b/packages/android-ndk/r13b/version.desc
index fcfe389..fcfe389 100644
--- a/packages/bionic/10e/version.desc
+++ b/packages/android-ndk/r13b/version.desc
diff --git a/packages/bionic/14b/version.desc b/packages/android-ndk/r14b/version.desc
index e69de29..e69de29 100644
--- a/packages/bionic/14b/version.desc
+++ b/packages/android-ndk/r14b/version.desc
diff --git a/packages/android-ndk/r15b/version.desc b/packages/android-ndk/r15b/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/android-ndk/r15b/version.desc
diff --git a/packages/bionic/15-beta2/version.desc b/packages/bionic/15-beta2/version.desc
deleted file mode 100644
index 76f1447..0000000
--- a/packages/bionic/15-beta2/version.desc
+++ /dev/null
@@ -1 +0,0 @@
-experimental='yes'
diff --git a/packages/gdb/package.desc b/packages/gdb/package.desc
index 90cef6a..c23c701 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)'
-milestones='7.0 7.2'
+milestones='7.0 7.2 8.0'
diff --git a/packages/uClibc-ng/package.desc b/packages/uClibc-ng/package.desc
index 1d514fb..f03bd80 100644
--- a/packages/uClibc-ng/package.desc
+++ b/packages/uClibc-ng/package.desc
@@ -1,4 +1,4 @@
+master='uClibc'
 origin='uclibc-ng.org'
 repository='git git://uclibc-ng.org/git/uclibc-ng'
 mirrors='http://downloads.uclibc-ng.org/releases/${CT_UCLIBC_NG_VERSION}'
-milestones='0.9.33.2 1.0.0 1.0.15'
diff --git a/packages/uClibc/package.desc b/packages/uClibc/package.desc
index fd2050a..887e4c2 100644
--- a/packages/uClibc/package.desc
+++ b/packages/uClibc/package.desc
@@ -1,6 +1,7 @@
-# Technically, it is the other way around: uClibc-ng is a fork of uClibc. But
-# uClibc is no longer maintained, so we want people to use uClibc-ng.
-master='uClibc-ng'
+# Even though this is the "master" package, we really want to steer the users
+# towards uClibc-ng, as the original uClibc is no longer maintained.
+preferred='uClibc-ng'
 origin='uclibc.org'
 repository='git git://git.busybox.net/uClibc'
 mirrors='http://www.uclibc.org/downloads http://www.uclibc.org/downloads/old-releases'
+milestones='0.9.33.2 1.0.0 1.0.15'