From d0ff020e23372a8eccd319c142c72d266c652f56 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Sat, 1 Jul 2017 20:17:56 -0700 Subject: 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 --- packages/android-ndk/package.desc | 3 +++ packages/android-ndk/r10e/version.desc | 1 + packages/android-ndk/r11c/version.desc | 1 + packages/android-ndk/r12b/version.desc | 1 + packages/android-ndk/r13b/version.desc | 1 + packages/android-ndk/r14b/version.desc | 0 packages/android-ndk/r15b/version.desc | 0 packages/bionic/10e/version.desc | 1 - packages/bionic/11c/version.desc | 1 - packages/bionic/12b/version.desc | 1 - packages/bionic/13b/version.desc | 1 - packages/bionic/14b/version.desc | 0 packages/bionic/15-beta2/version.desc | 1 - packages/bionic/package.desc | 2 -- packages/gdb/package.desc | 2 +- packages/uClibc-ng/package.desc | 2 +- packages/uClibc/package.desc | 7 ++++--- 17 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 packages/android-ndk/package.desc create mode 100644 packages/android-ndk/r10e/version.desc create mode 100644 packages/android-ndk/r11c/version.desc create mode 100644 packages/android-ndk/r12b/version.desc create mode 100644 packages/android-ndk/r13b/version.desc create mode 100644 packages/android-ndk/r14b/version.desc create mode 100644 packages/android-ndk/r15b/version.desc delete mode 100644 packages/bionic/10e/version.desc delete mode 100644 packages/bionic/11c/version.desc delete mode 100644 packages/bionic/12b/version.desc delete mode 100644 packages/bionic/13b/version.desc delete mode 100644 packages/bionic/14b/version.desc delete mode 100644 packages/bionic/15-beta2/version.desc delete mode 100644 packages/bionic/package.desc (limited to 'packages') diff --git a/packages/android-ndk/package.desc b/packages/android-ndk/package.desc new file mode 100644 index 00000000..a422ee83 --- /dev/null +++ b/packages/android-ndk/package.desc @@ -0,0 +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/android-ndk/r10e/version.desc b/packages/android-ndk/r10e/version.desc new file mode 100644 index 00000000..fcfe3891 --- /dev/null +++ b/packages/android-ndk/r10e/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/android-ndk/r11c/version.desc b/packages/android-ndk/r11c/version.desc new file mode 100644 index 00000000..fcfe3891 --- /dev/null +++ b/packages/android-ndk/r11c/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/android-ndk/r12b/version.desc b/packages/android-ndk/r12b/version.desc new file mode 100644 index 00000000..fcfe3891 --- /dev/null +++ b/packages/android-ndk/r12b/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/android-ndk/r13b/version.desc b/packages/android-ndk/r13b/version.desc new file mode 100644 index 00000000..fcfe3891 --- /dev/null +++ b/packages/android-ndk/r13b/version.desc @@ -0,0 +1 @@ +obsolete='yes' diff --git a/packages/android-ndk/r14b/version.desc b/packages/android-ndk/r14b/version.desc new file mode 100644 index 00000000..e69de29b diff --git a/packages/android-ndk/r15b/version.desc b/packages/android-ndk/r15b/version.desc new file mode 100644 index 00000000..e69de29b diff --git a/packages/bionic/10e/version.desc b/packages/bionic/10e/version.desc deleted file mode 100644 index fcfe3891..00000000 --- a/packages/bionic/10e/version.desc +++ /dev/null @@ -1 +0,0 @@ -obsolete='yes' diff --git a/packages/bionic/11c/version.desc b/packages/bionic/11c/version.desc deleted file mode 100644 index fcfe3891..00000000 --- a/packages/bionic/11c/version.desc +++ /dev/null @@ -1 +0,0 @@ -obsolete='yes' diff --git a/packages/bionic/12b/version.desc b/packages/bionic/12b/version.desc deleted file mode 100644 index fcfe3891..00000000 --- a/packages/bionic/12b/version.desc +++ /dev/null @@ -1 +0,0 @@ -obsolete='yes' diff --git a/packages/bionic/13b/version.desc b/packages/bionic/13b/version.desc deleted file mode 100644 index fcfe3891..00000000 --- a/packages/bionic/13b/version.desc +++ /dev/null @@ -1 +0,0 @@ -obsolete='yes' diff --git a/packages/bionic/14b/version.desc b/packages/bionic/14b/version.desc deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/bionic/15-beta2/version.desc b/packages/bionic/15-beta2/version.desc deleted file mode 100644 index 76f14476..00000000 --- a/packages/bionic/15-beta2/version.desc +++ /dev/null @@ -1 +0,0 @@ -experimental='yes' diff --git a/packages/bionic/package.desc b/packages/bionic/package.desc deleted file mode 100644 index 6e3d374a..00000000 --- a/packages/bionic/package.desc +++ /dev/null @@ -1,2 +0,0 @@ -# We don't support building bionic (yet) so no official repository -mirrors='https://dl.google.com/android/repository' diff --git a/packages/gdb/package.desc b/packages/gdb/package.desc index 90cef6a6..c23c701e 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 1d514fb7..f03bd804 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 fd2050aa..887e4c26 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' -- cgit v1.2.3