From 567277099a487508fd228a4c56f3583db3fa96c9 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Mon, 29 May 2017 22:32:38 -0700 Subject: [PATCH] Fix the references to old config variables Signed-off-by: Alexey Neyman --- Makefile.in | 2 +- TODO | 9 ++ config/binutils.in | 3 - config/cc.in | 11 +- config/cc/gcc.in.2 | 7 +- config/kernel.in | 6 - config/libc.in | 17 --- config/libc/bionic.in | 2 +- config/libc/glibc.in | 43 +----- config/libc/glibc.in.2 | 86 +++++++++--- config/libc/newlib.in | 8 ++ config/libc/newlib.in.2 | 4 +- config/target.in | 3 - maintainer/gen-kconfig.sh | 1 + maintainer/gen-versions.sh | 80 ++++++----- maintainer/kconfig-versions.template | 91 ++++++++++--- packages/autoconf/package.desc | 3 +- packages/autoconf/version.desc | 2 +- packages/automake/1.11.1/version.desc | 2 +- packages/automake/1.11.6/version.desc | 2 +- packages/automake/1.14/version.desc | 2 +- packages/automake/package.desc | 3 +- packages/avr-libc/1.8.0/version.desc | 2 +- packages/avr-libc/package.desc | 3 +- .../2.23.2-2013.10-4/version.desc | 2 +- .../2.24.0-2014.11-2/version.desc | 2 +- .../2.25.0-2015.01-2/version.desc | 2 +- packages/binutils-linaro/package.desc | 10 +- packages/binutils/2.23.2/version.desc | 2 +- packages/binutils/2.24/version.desc | 2 +- packages/binutils/2.25.1/version.desc | 2 +- packages/binutils/package.desc | 8 +- packages/bionic/10e/version.desc | 2 +- packages/bionic/11c/version.desc | 2 +- packages/bionic/12b/version.desc | 2 +- packages/bionic/13b/version.desc | 2 +- packages/bionic/15-beta2/version.desc | 2 +- packages/bionic/package.desc | 1 + packages/cloog/0.18.0/version.desc | 2 +- packages/cloog/0.18.1/version.desc | 2 +- packages/cloog/package.desc | 7 +- packages/duma/package.desc | 3 +- packages/elf2flt/package.desc | 4 +- packages/expat/2.1.1/version.desc | 2 +- packages/expat/package.desc | 3 +- packages/gcc-linaro/4.8-2015.06/version.desc | 2 +- .../1100-ubsan-fix-check-empty-string.patch | 28 ++++ packages/gcc-linaro/package.desc | 10 +- packages/gcc/4.8.5/version.desc | 2 +- packages/gcc/package.desc | 8 +- packages/gdb-linaro/7.3-2011.12/version.desc | 2 +- packages/gdb-linaro/7.4-2012.06/version.desc | 2 +- packages/gdb-linaro/7.5-2012.12/version.desc | 2 +- .../gdb-linaro/7.6.1-2013.10/version.desc | 2 +- packages/gdb-linaro/7.7-2014.05/version.desc | 2 +- .../gdb-linaro/7.7.1-2014.06-1/version.desc | 2 +- packages/gdb-linaro/7.8-2014.09/version.desc | 2 +- packages/gdb-linaro/package.desc | 10 +- packages/gdb/6.8a/version.desc | 2 +- packages/gdb/7.0.1a/version.desc | 2 +- packages/gdb/7.0a/version.desc | 2 +- packages/gdb/7.10.1/version.desc | 2 +- packages/gdb/7.10/version.desc | 2 +- packages/gdb/7.1a/version.desc | 2 +- packages/gdb/7.2a/version.desc | 2 +- packages/gdb/7.3.1/version.desc | 2 +- packages/gdb/7.3a/version.desc | 2 +- packages/gdb/7.4.1/version.desc | 2 +- packages/gdb/7.4/version.desc | 2 +- packages/gdb/7.5.1/version.desc | 2 +- packages/gdb/7.6.1/version.desc | 2 +- packages/gdb/7.7.1/version.desc | 2 +- packages/gdb/7.7/version.desc | 2 +- packages/gdb/7.8.1/version.desc | 2 +- packages/gdb/7.8/version.desc | 2 +- packages/gdb/7.9.1/version.desc | 2 +- packages/gdb/7.9/version.desc | 2 +- packages/gdb/package.desc | 7 +- packages/gettext/0.19.7/version.desc | 2 +- packages/gettext/package.desc | 3 +- .../glibc-linaro/2.20-2014.11/version.desc | 2 +- packages/glibc-linaro/package.desc | 9 +- .../090-Fix-ARM-build-with-GCC-trunk.patch | 0 .../2.12.1}/100-respect-env-CPPFLAGS.patch | 0 .../120-i386-x86_64-revert-clone-cfi.patch | 0 .../2.12.1}/140-disable-ldconfig.patch | 0 .../2.12.1}/150-queue-header-updates.patch | 0 .../2.12.1}/160-manual-no-perl.patch | 0 .../170-localedef-fix-trampoline.patch | 0 .../2.12.1}/180-resolv-dynamic.patch | 0 .../2.12.1}/190-localedef-mmap.patch | 0 .../2.12.1}/200-fadvise64_64.patch | 0 .../2.12.1}/220-section-comments.patch | 0 .../2.12.1}/230-no-inline-gmon.patch | 0 .../2.12.1}/240-check_native-headers.patch | 0 .../2.12.1}/250-fix-pr631.patch | 0 .../2.12.1}/260-assume-pipe2.patch | 0 .../2.12.1}/270-china.patch | 0 .../2.12.1}/280-new-valencian-locale.patch | 0 .../2.12.1}/300-nscd-one-fork.patch | 0 .../2.12.1}/310-hppa-nptl-carlos.patch | 0 .../2.12.1}/330-m68k-sys-user.patch | 0 .../340-dl_execstack-PaX-support.patch | 0 .../2.12.1}/350-pre20040117-pt_pax.patch | 0 .../360-tests-sandbox-libdl-paths.patch | 0 .../2.12.1}/370-fnmatch.patch | 0 .../2.12.1}/380-dont-build-timezone.patch | 0 .../2.12.1}/400-alpha-xstat.patch | 0 .../2.12.1}/430-alpha-creat.patch | 0 .../2.12.1}/440-alpha-cache-shape.patch | 0 .../460-alpha-fix-gcc-4.1-warnings.patch | 0 ...90-alpha_alpha-add-fdatasync-support.patch | 0 .../2.12.1}/530-alpha-fix-rtld-fPIC.patch | 0 .../2.12.1}/560-ppc-atomic.patch | 0 ...rm-cirrus-ep93xx-maverick-crunch-fpu.patch | 0 .../2.12.1}/580-nptl-lowlevellock.patch | 0 .../2.12.1}/610-fpu-cw-mips.patch | 0 .../2.12.1}/630-mips_shn_undef-hack.patch | 0 .../2.12.1}/640-alpha-atfcts.patch | 0 .../2.12.1}/650-syslog.patch | 0 ...0-debug-readlink_chk-readklinkat_chk.patch | 0 .../2.12.1}/670-support-hard-float-eabi.patch | 0 packages/glibc-ports/2.12.1/version.desc | 0 .../090-Fix-ARM-build-with-GCC-trunk.patch | 0 .../2.13}/100-respect-env-CPPFLAGS.patch | 0 .../120-i386-x86_64-revert-clone-cfi.patch | 0 .../2.13}/140-disable-ldconfig.patch | 0 .../2.13}/150-queue-header-updates.patch | 0 .../2.13}/160-manual-no-perl.patch | 0 .../2.13}/170-localedef-fix-trampoline.patch | 0 .../2.13}/180-resolv-dynamic.patch | 0 .../2.13}/190-localedef-mmap.patch | 0 .../2.13}/200-fadvise64_64.patch | 0 .../2.13}/220-section-comments.patch | 0 .../2.13}/230-no-inline-gmon.patch | 0 .../2.13}/240-check_native-headers.patch | 0 .../2.13}/250-fix-pr631.patch | 0 .../2.13}/260-assume-pipe2.patch | 0 .../2.13}/270-china.patch | 0 .../2.13}/280-new-valencian-locale.patch | 0 .../2.13}/300-nscd-one-fork.patch | 0 .../2.13}/310-hppa-nptl-carlos.patch | 0 .../2.13}/330-m68k-sys-user.patch | 0 .../2.13}/340-dl_execstack-PaX-support.patch | 0 .../2.13}/350-pre20040117-pt_pax.patch | 0 .../2.13}/360-tests-sandbox-libdl-paths.patch | 0 .../2.13}/380-dont-build-timezone.patch | 0 .../2.13}/400-alpha-xstat.patch | 0 .../2.13}/410-alpha-SETPIPE-GETPIPE.patch | 0 .../2.13}/420-alpha-statfs.patch | 0 .../2.13}/430-alpha-creat.patch | 0 .../2.13}/440-alpha-cache-shape.patch | 0 .../2.13}/450-alpha-DEFAULT_STACK_PERMS.patch | 0 .../460-alpha-fix-gcc-4.1-warnings.patch | 0 .../2.13}/470-alpha-feupdateenv.patch | 0 ...90-alpha_alpha-add-fdatasync-support.patch | 0 .../2.13}/530-alpha-fix-rtld-fPIC.patch | 0 .../2.13}/560-ppc-atomic.patch | 0 ...rm-cirrus-ep93xx-maverick-crunch-fpu.patch | 0 .../2.13}/580-nptl-lowlevellock.patch | 0 .../2.13}/610-fpu-cw-mips.patch | 0 .../2.13}/630-mips_shn_undef-hack.patch | 0 .../2.13}/640-alpha-atfcts.patch | 0 .../2.13}/650-syslog.patch | 0 ...0-debug-readlink_chk-readklinkat_chk.patch | 0 .../2.13}/670-support-hard-float-eabi.patch | 0 packages/glibc-ports/2.13/version.desc | 0 .../090-Fix-ARM-build-with-GCC-trunk.patch | 0 .../2.14.1}/100-respect-env-CPPFLAGS.patch | 0 .../120-i386-x86_64-revert-clone-cfi.patch | 0 .../2.14.1}/140-disable-ldconfig.patch | 0 .../2.14.1}/150-queue-header-updates.patch | 0 .../2.14.1}/160-manual-no-perl.patch | 0 .../170-localedef-fix-trampoline.patch | 0 .../2.14.1}/180-resolv-dynamic.patch | 0 .../2.14.1}/190-localedef-mmap.patch | 0 .../2.14.1}/200-fadvise64_64.patch | 0 .../2.14.1}/220-section-comments.patch | 0 .../2.14.1}/230-no-inline-gmon.patch | 0 .../2.14.1}/260-assume-pipe2.patch | 0 .../2.14.1}/270-china.patch | 0 .../2.14.1}/280-new-valencian-locale.patch | 0 .../2.14.1}/300-nscd-one-fork.patch | 0 .../2.14.1}/310-hppa-nptl-carlos.patch | 0 .../2.14.1}/330-m68k-sys-user.patch | 0 .../340-dl_execstack-PaX-support.patch | 0 .../2.14.1}/350-pre20040117-pt_pax.patch | 0 .../360-tests-sandbox-libdl-paths.patch | 0 .../2.14.1}/380-dont-build-timezone.patch | 0 .../2.14.1}/400-alpha-xstat.patch | 0 .../2.14.1}/430-alpha-creat.patch | 0 .../2.14.1}/440-alpha-cache-shape.patch | 0 .../460-alpha-fix-gcc-4.1-warnings.patch | 0 ...90-alpha_alpha-add-fdatasync-support.patch | 0 .../2.14.1}/530-alpha-fix-rtld-fPIC.patch | 0 .../2.14.1}/560-ppc-atomic.patch | 0 ...rm-cirrus-ep93xx-maverick-crunch-fpu.patch | 0 .../2.14.1}/580-nptl-lowlevellock.patch | 0 .../2.14.1}/610-fpu-cw-mips.patch | 0 .../2.14.1}/630-mips_shn_undef-hack.patch | 0 .../2.14.1}/640-alpha-atfcts.patch | 0 .../2.14.1}/650-syslog.patch | 0 ...0-debug-readlink_chk-readklinkat_chk.patch | 0 packages/glibc-ports/2.14.1/version.desc | 0 .../090-Fix-ARM-build-with-GCC-trunk.patch | 0 .../2.14}/100-respect-env-CPPFLAGS.patch | 0 .../120-i386-x86_64-revert-clone-cfi.patch | 0 .../2.14}/140-disable-ldconfig.patch | 0 .../2.14}/150-queue-header-updates.patch | 0 .../2.14}/160-manual-no-perl.patch | 0 .../2.14}/170-localedef-fix-trampoline.patch | 0 .../2.14}/180-resolv-dynamic.patch | 0 .../2.14}/190-localedef-mmap.patch | 0 .../2.14}/200-fadvise64_64.patch | 0 .../2.14}/220-section-comments.patch | 0 .../2.14}/230-no-inline-gmon.patch | 0 .../2.14}/240-check_native-headers.patch | 0 .../2.14}/260-assume-pipe2.patch | 0 .../2.14}/270-china.patch | 0 .../2.14}/280-new-valencian-locale.patch | 0 .../2.14}/300-nscd-one-fork.patch | 0 .../2.14}/310-hppa-nptl-carlos.patch | 0 .../2.14}/330-m68k-sys-user.patch | 0 .../2.14}/340-dl_execstack-PaX-support.patch | 0 .../2.14}/350-pre20040117-pt_pax.patch | 0 .../2.14}/360-tests-sandbox-libdl-paths.patch | 0 .../2.14}/380-dont-build-timezone.patch | 0 .../2.14}/400-alpha-xstat.patch | 0 .../2.14}/430-alpha-creat.patch | 0 .../2.14}/440-alpha-cache-shape.patch | 0 .../460-alpha-fix-gcc-4.1-warnings.patch | 0 ...90-alpha_alpha-add-fdatasync-support.patch | 0 .../2.14}/530-alpha-fix-rtld-fPIC.patch | 0 .../2.14}/560-ppc-atomic.patch | 0 ...rm-cirrus-ep93xx-maverick-crunch-fpu.patch | 0 .../2.14}/580-nptl-lowlevellock.patch | 0 .../2.14}/610-fpu-cw-mips.patch | 0 .../2.14}/630-mips_shn_undef-hack.patch | 0 .../2.14}/640-alpha-atfcts.patch | 0 .../2.14}/650-syslog.patch | 0 ...0-debug-readlink_chk-readklinkat_chk.patch | 0 packages/glibc-ports/2.14/version.desc | 0 .../090-Fix-ARM-build-with-GCC-trunk.patch | 0 .../2.15}/091-libmemusage-link-failure.patch | 0 .../2.15}/100-respect-env-CPPFLAGS.patch | 0 .../120-i386-x86_64-revert-clone-cfi.patch | 0 .../2.15}/140-disable-ldconfig.patch | 0 .../2.15}/150-queue-header-updates.patch | 0 .../2.15}/160-manual-no-perl.patch | 0 .../2.15}/170-localedef-fix-trampoline.patch | 0 .../2.15}/180-resolv-dynamic.patch | 0 .../2.15}/200-fadvise64_64.patch | 0 .../2.15}/220-section-comments.patch | 0 .../2.15}/230-no-inline-gmon.patch | 0 .../2.15}/260-assume-pipe2.patch | 0 .../2.15}/270-china.patch | 0 .../2.15}/280-new-valencian-locale.patch | 0 .../2.15}/300-nscd-one-fork.patch | 0 .../2.15}/310-hppa-nptl-carlos.patch | 0 .../2.15}/330-m68k-sys-user.patch | 0 .../2.15}/340-dl_execstack-PaX-support.patch | 0 .../2.15}/350-pre20040117-pt_pax.patch | 0 .../2.15}/360-tests-sandbox-libdl-paths.patch | 0 .../2.15}/380-dont-build-timezone.patch | 0 .../2.15}/400-alpha-xstat.patch | 0 .../2.15}/430-alpha-creat.patch | 0 .../2.15}/440-alpha-cache-shape.patch | 0 .../460-alpha-fix-gcc-4.1-warnings.patch | 0 ...90-alpha_alpha-add-fdatasync-support.patch | 0 .../2.15}/530-alpha-fix-rtld-fPIC.patch | 0 .../2.15}/560-ppc-atomic.patch | 0 ...rm-cirrus-ep93xx-maverick-crunch-fpu.patch | 0 .../2.15}/580-nptl-lowlevellock.patch | 0 .../2.15}/610-fpu-cw-mips.patch | 0 .../2.15}/630-mips_shn_undef-hack.patch | 0 .../2.15}/640-alpha-atfcts.patch | 0 .../2.15}/650-syslog.patch | 0 ...0-debug-readlink_chk-readklinkat_chk.patch | 0 packages/glibc-ports/2.15/version.desc | 0 .../090-Fix-ARM-build-with-GCC-trunk.patch | 0 .../2.16.0}/100-respect-env-CPPFLAGS.patch | 0 .../120-i386-x86_64-revert-clone-cfi.patch | 0 .../2.16.0}/140-disable-ldconfig.patch | 0 .../2.16.0}/150-queue-header-updates.patch | 0 .../170-localedef-fix-trampoline.patch | 0 .../2.16.0}/180-resolv-dynamic.patch | 0 .../2.16.0}/200-fadvise64_64.patch | 0 .../2.16.0}/260-assume-pipe2.patch | 0 .../2.16.0}/270-china.patch | 0 .../2.16.0}/280-new-valencian-locale.patch | 0 .../2.16.0}/300-nscd-one-fork.patch | 0 .../2.16.0}/310-hppa-nptl-carlos.patch | 0 .../2.16.0}/330-m68k-sys-user.patch | 0 .../340-dl_execstack-PaX-support.patch | 0 .../2.16.0}/350-pre20040117-pt_pax.patch | 0 .../360-tests-sandbox-libdl-paths.patch | 0 .../2.16.0}/380-dont-build-timezone.patch | 0 .../2.16.0}/400-alpha-xstat.patch | 0 .../2.16.0}/430-alpha-creat.patch | 0 .../2.16.0}/440-alpha-cache-shape.patch | 0 .../460-alpha-fix-gcc-4.1-warnings.patch | 0 ...90-alpha_alpha-add-fdatasync-support.patch | 0 .../2.16.0}/530-alpha-fix-rtld-fPIC.patch | 0 .../2.16.0}/560-ppc-atomic.patch | 0 .../2.16.0}/580-nptl-lowlevellock.patch | 0 .../2.16.0}/610-fpu-cw-mips.patch | 0 .../2.16.0}/630-mips_shn_undef-hack.patch | 0 .../2.16.0}/640-alpha-atfcts.patch | 0 .../2.16.0}/650-syslog.patch | 0 ...0-debug-readlink_chk-readklinkat_chk.patch | 0 packages/glibc-ports/2.16.0/version.desc | 0 packages/glibc-ports/package.desc | 8 ++ packages/glibc/2.12.2/version.desc | 2 +- packages/glibc/2.13/version.desc | 2 +- packages/glibc/2.14.1/version.desc | 2 +- packages/glibc/2.14/version.desc | 2 +- packages/glibc/2.15/version.desc | 2 +- packages/glibc/2.16.0/version.desc | 2 +- packages/glibc/2.18/version.desc | 2 +- packages/glibc/2.20/version.desc | 2 +- packages/glibc/2.21/version.desc | 2 +- packages/glibc/2.22/version.desc | 2 +- packages/glibc/package.desc | 7 +- packages/gmp/4.3.0/version.desc | 2 +- packages/gmp/4.3.1/version.desc | 2 +- packages/gmp/4.3.2/version.desc | 2 +- packages/gmp/5.0.1/version.desc | 2 +- packages/gmp/5.0.2/version.desc | 2 +- packages/gmp/5.1.1/version.desc | 2 +- packages/gmp/5.1.3/version.desc | 2 +- packages/gmp/6.0.0a/version.desc | 2 +- packages/gmp/6.1.0/version.desc | 2 +- packages/gmp/package.desc | 5 +- packages/isl/0.11.1/version.desc | 2 +- packages/isl/0.12.2/version.desc | 2 +- packages/isl/0.14/version.desc | 2 +- packages/isl/package.desc | 5 +- packages/libelf/0.8.12/version.desc | 2 +- packages/libelf/package.desc | 1 + packages/libiconv/1.14/version.desc | 2 +- packages/libiconv/package.desc | 3 +- packages/libtool/package.desc | 3 +- packages/linux/2.6.33.7/version.desc | 2 +- packages/linux/2.6.34.7/version.desc | 2 +- packages/linux/2.6.35.9/version.desc | 2 +- packages/linux/2.6.36.4/version.desc | 2 +- packages/linux/2.6.37.6/version.desc | 2 +- packages/linux/2.6.38.8/version.desc | 2 +- packages/linux/2.6.39.4/version.desc | 2 +- packages/linux/3.0.101/version.desc | 2 +- packages/linux/3.1.10/version.desc | 2 +- packages/linux/3.11.10/version.desc | 2 +- packages/linux/3.14.79/version.desc | 2 +- packages/linux/3.15.10/version.desc | 2 +- packages/linux/3.17.8/version.desc | 2 +- packages/linux/3.18.48/version.desc | 2 +- packages/linux/3.19.8/version.desc | 2 +- packages/linux/3.3.8/version.desc | 2 +- packages/linux/3.5.7/version.desc | 2 +- packages/linux/3.6.11/version.desc | 2 +- packages/linux/3.7.10/version.desc | 2 +- packages/linux/3.8.13/version.desc | 2 +- packages/linux/3.9.11/version.desc | 2 +- packages/linux/4.0.9/version.desc | 2 +- packages/linux/4.10.8/version.desc | 2 +- packages/linux/4.2.8/version.desc | 2 +- packages/linux/4.3.6/version.desc | 2 +- packages/linux/4.5.7/version.desc | 2 +- packages/linux/4.6.7/version.desc | 2 +- packages/linux/4.7.10/version.desc | 2 +- packages/linux/4.8.17/version.desc | 2 +- packages/linux/package.desc | 3 +- packages/ltrace/0.5.3/version.desc | 2 +- packages/ltrace/package.desc | 3 +- packages/m4/1.4.13/version.desc | 2 +- packages/m4/1.4.17/version.desc | 2 +- packages/m4/package.desc | 3 +- packages/make/3.81/version.desc | 2 +- packages/make/4.0/version.desc | 2 +- packages/make/4.1/version.desc | 2 +- packages/make/package.desc | 3 +- packages/mingw-w64/package.desc | 3 +- packages/mingw-w64/v2.0.7/version.desc | 2 +- packages/mingw-w64/v2.0.8/version.desc | 2 +- packages/mingw-w64/v2.0.9/version.desc | 2 +- packages/mingw-w64/v3.0.0/version.desc | 2 +- packages/mingw-w64/v3.1.0/version.desc | 2 +- packages/mingw-w64/v3.2.0/version.desc | 2 +- packages/mingw-w64/v3.3.0/version.desc | 2 +- packages/mingw-w64/v4.0.0/version.desc | 2 +- packages/mingw-w64/v4.0.1/version.desc | 2 +- packages/mingw-w64/v4.0.2/version.desc | 2 +- packages/mingw-w64/v4.0.4/version.desc | 2 +- packages/mingw-w64/v4.0.5/version.desc | 2 +- packages/mingw-w64/v5.0.0/version.desc | 2 +- packages/mpc/0.7/version.desc | 2 +- packages/mpc/0.8.1/version.desc | 2 +- packages/mpc/0.8.2/version.desc | 2 +- packages/mpc/0.9/version.desc | 2 +- packages/mpc/1.0.1/version.desc | 2 +- packages/mpc/1.0.2/version.desc | 2 +- packages/mpc/1.0/version.desc | 2 +- packages/mpc/package.desc | 3 +- packages/mpfr/2.4.0/version.desc | 2 +- packages/mpfr/2.4.1/version.desc | 2 +- packages/mpfr/2.4.2/version.desc | 2 +- packages/mpfr/3.0.0/version.desc | 2 +- packages/mpfr/3.0.1/version.desc | 2 +- packages/mpfr/3.1.0/version.desc | 2 +- packages/mpfr/3.1.1/version.desc | 2 +- packages/mpfr/3.1.2/version.desc | 2 +- packages/mpfr/3.1.3/version.desc | 2 +- packages/mpfr/package.desc | 3 +- packages/musl/1.1.15/version.desc | 2 +- packages/musl/package.desc | 3 +- packages/ncurses/package.desc | 1 + .../newlib-linaro/2.1.0-2014.09/version.desc | 2 +- .../newlib-linaro/2.2.0-2015.01/version.desc | 2 +- packages/newlib-linaro/package.desc | 9 +- packages/newlib/1.17.0/version.desc | 2 +- packages/newlib/1.18.0/version.desc | 2 +- packages/newlib/1.19.0/version.desc | 2 +- packages/newlib/1.20.0/version.desc | 2 +- packages/newlib/2.0.0/version.desc | 2 +- packages/newlib/2.1.0/version.desc | 2 +- packages/newlib/2.2.0.20151023/version.desc | 2 +- packages/newlib/2.3.0.20160226/version.desc | 2 +- packages/newlib/2.4.0.20161025/version.desc | 2 +- packages/newlib/package.desc | 7 +- packages/strace/4.10/version.desc | 2 +- packages/strace/4.11/version.desc | 2 +- packages/strace/4.12/version.desc | 2 +- packages/strace/4.13/version.desc | 2 +- packages/strace/4.14/version.desc | 2 +- packages/strace/4.5.18/version.desc | 2 +- packages/strace/4.5.19/version.desc | 2 +- packages/strace/4.5.20/version.desc | 2 +- packages/strace/4.6/version.desc | 2 +- packages/strace/4.7/version.desc | 2 +- packages/strace/4.8/version.desc | 2 +- packages/strace/4.9/version.desc | 2 +- packages/strace/package.desc | 3 +- packages/uClibc-ng/1.0.20/version.desc | 2 +- packages/uClibc-ng/1.0.21/version.desc | 2 +- packages/uClibc-ng/package.desc | 7 +- packages/uClibc/0.9.33.2/version.desc | 2 +- packages/uClibc/package.desc | 7 +- packages/zlib/package.desc | 3 +- .../crosstool.config | 2 +- .../crosstool.config | 1 - .../crosstool.config | 7 +- .../crosstool.config | 1 - .../armv6-rpi-linux-gnueabi/crosstool.config | 9 +- .../i686-centos6-linux-gnu/crosstool.config | 4 +- .../i686-centos7-linux-gnu/crosstool.config | 4 +- .../crosstool.config | 4 +- .../crosstool.config | 4 +- .../crosstool.config | 4 +- .../powerpc-860-linux-gnu/crosstool.config | 2 +- .../crosstool.config | 1 - .../crosstool.config | 1 - .../sparc-leon-linux-uclibc/crosstool.config | 4 +- .../x86_64-centos6-linux-gnu/crosstool.config | 4 +- .../x86_64-centos7-linux-gnu/crosstool.config | 4 +- .../crosstool.config | 2 +- .../crosstool.config | 4 +- .../crosstool.config | 4 +- .../crosstool.config | 4 +- .../x86_64-unknown-linux-gnu/crosstool.config | 2 +- .../crosstool.config | 7 +- scripts/build/binutils/binutils.sh | 44 ++---- scripts/build/cc/{100-gcc.sh => gcc.sh} | 44 ++---- scripts/build/companion_libs/050-zlib.sh | 10 +- scripts/build/companion_libs/100-gmp.sh | 9 +- scripts/build/companion_libs/110-mpfr.sh | 10 +- scripts/build/companion_libs/121-isl.sh | 8 +- scripts/build/companion_libs/130-cloog.sh | 12 +- scripts/build/companion_libs/140-mpc.sh | 9 +- scripts/build/companion_libs/200-libelf.sh | 10 +- scripts/build/companion_libs/210-expat.sh | 8 +- scripts/build/companion_libs/220-ncurses.sh | 10 +- scripts/build/companion_libs/320-libiconv.sh | 8 +- scripts/build/companion_libs/330-gettext.sh | 8 +- scripts/build/companion_tools/050-make.sh | 9 +- scripts/build/companion_tools/100-m4.sh | 8 +- scripts/build/companion_tools/200-autoconf.sh | 9 +- scripts/build/companion_tools/300-automake.sh | 9 +- scripts/build/companion_tools/400-libtool.sh | 9 +- scripts/build/debug/200-duma.sh | 20 +-- scripts/build/debug/300-gdb.sh | 37 ++--- scripts/build/debug/400-ltrace.sh | 15 +-- scripts/build/debug/500-strace.sh | 10 +- scripts/build/internals.sh | 9 +- scripts/build/kernel/linux.sh | 55 +------- scripts/build/libc/avr-libc.sh | 38 ++---- scripts/build/libc/bionic.sh | 16 +-- scripts/build/libc/glibc.sh | 127 ++++-------------- scripts/build/libc/mingw.sh | 34 ++--- scripts/build/libc/musl.sh | 14 +- scripts/build/libc/newlib.sh | 35 +---- scripts/build/libc/uClibc.sh | 42 ++---- scripts/build/test_suite/gcc.sh | 2 +- scripts/functions | 90 ++++++++----- scripts/saveSample.sh.in | 4 +- scripts/showSamples.sh | 31 +++-- 505 files changed, 813 insertions(+), 993 deletions(-) create mode 100644 packages/gcc-linaro/6.3-2017.05/1100-ubsan-fix-check-empty-string.patch rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/090-Fix-ARM-build-with-GCC-trunk.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/100-respect-env-CPPFLAGS.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/120-i386-x86_64-revert-clone-cfi.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/140-disable-ldconfig.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/150-queue-header-updates.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/160-manual-no-perl.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/170-localedef-fix-trampoline.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/180-resolv-dynamic.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/190-localedef-mmap.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/200-fadvise64_64.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/220-section-comments.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/230-no-inline-gmon.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/240-check_native-headers.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/250-fix-pr631.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/260-assume-pipe2.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/270-china.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/280-new-valencian-locale.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/300-nscd-one-fork.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/310-hppa-nptl-carlos.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/330-m68k-sys-user.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/340-dl_execstack-PaX-support.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/350-pre20040117-pt_pax.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/360-tests-sandbox-libdl-paths.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/370-fnmatch.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/380-dont-build-timezone.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/400-alpha-xstat.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/430-alpha-creat.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/440-alpha-cache-shape.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/460-alpha-fix-gcc-4.1-warnings.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/490-alpha_alpha-add-fdatasync-support.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/530-alpha-fix-rtld-fPIC.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/560-ppc-atomic.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/580-nptl-lowlevellock.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/610-fpu-cw-mips.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/630-mips_shn_undef-hack.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/640-alpha-atfcts.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/650-syslog.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/660-debug-readlink_chk-readklinkat_chk.patch (100%) rename packages/{glibc/ports-2.12.1 => glibc-ports/2.12.1}/670-support-hard-float-eabi.patch (100%) create mode 100644 packages/glibc-ports/2.12.1/version.desc rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/090-Fix-ARM-build-with-GCC-trunk.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/100-respect-env-CPPFLAGS.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/120-i386-x86_64-revert-clone-cfi.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/140-disable-ldconfig.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/150-queue-header-updates.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/160-manual-no-perl.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/170-localedef-fix-trampoline.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/180-resolv-dynamic.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/190-localedef-mmap.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/200-fadvise64_64.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/220-section-comments.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/230-no-inline-gmon.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/240-check_native-headers.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/250-fix-pr631.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/260-assume-pipe2.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/270-china.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/280-new-valencian-locale.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/300-nscd-one-fork.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/310-hppa-nptl-carlos.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/330-m68k-sys-user.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/340-dl_execstack-PaX-support.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/350-pre20040117-pt_pax.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/360-tests-sandbox-libdl-paths.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/380-dont-build-timezone.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/400-alpha-xstat.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/410-alpha-SETPIPE-GETPIPE.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/420-alpha-statfs.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/430-alpha-creat.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/440-alpha-cache-shape.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/450-alpha-DEFAULT_STACK_PERMS.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/460-alpha-fix-gcc-4.1-warnings.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/470-alpha-feupdateenv.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/490-alpha_alpha-add-fdatasync-support.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/530-alpha-fix-rtld-fPIC.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/560-ppc-atomic.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/580-nptl-lowlevellock.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/610-fpu-cw-mips.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/630-mips_shn_undef-hack.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/640-alpha-atfcts.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/650-syslog.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/660-debug-readlink_chk-readklinkat_chk.patch (100%) rename packages/{glibc/ports-2.13 => glibc-ports/2.13}/670-support-hard-float-eabi.patch (100%) create mode 100644 packages/glibc-ports/2.13/version.desc rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/090-Fix-ARM-build-with-GCC-trunk.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/100-respect-env-CPPFLAGS.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/120-i386-x86_64-revert-clone-cfi.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/140-disable-ldconfig.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/150-queue-header-updates.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/160-manual-no-perl.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/170-localedef-fix-trampoline.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/180-resolv-dynamic.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/190-localedef-mmap.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/200-fadvise64_64.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/220-section-comments.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/230-no-inline-gmon.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/260-assume-pipe2.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/270-china.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/280-new-valencian-locale.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/300-nscd-one-fork.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/310-hppa-nptl-carlos.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/330-m68k-sys-user.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/340-dl_execstack-PaX-support.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/350-pre20040117-pt_pax.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/360-tests-sandbox-libdl-paths.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/380-dont-build-timezone.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/400-alpha-xstat.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/430-alpha-creat.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/440-alpha-cache-shape.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/460-alpha-fix-gcc-4.1-warnings.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/490-alpha_alpha-add-fdatasync-support.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/530-alpha-fix-rtld-fPIC.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/560-ppc-atomic.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/580-nptl-lowlevellock.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/610-fpu-cw-mips.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/630-mips_shn_undef-hack.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/640-alpha-atfcts.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/650-syslog.patch (100%) rename packages/{glibc/ports-2.14.1 => glibc-ports/2.14.1}/660-debug-readlink_chk-readklinkat_chk.patch (100%) create mode 100644 packages/glibc-ports/2.14.1/version.desc rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/090-Fix-ARM-build-with-GCC-trunk.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/100-respect-env-CPPFLAGS.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/120-i386-x86_64-revert-clone-cfi.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/140-disable-ldconfig.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/150-queue-header-updates.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/160-manual-no-perl.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/170-localedef-fix-trampoline.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/180-resolv-dynamic.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/190-localedef-mmap.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/200-fadvise64_64.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/220-section-comments.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/230-no-inline-gmon.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/240-check_native-headers.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/260-assume-pipe2.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/270-china.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/280-new-valencian-locale.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/300-nscd-one-fork.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/310-hppa-nptl-carlos.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/330-m68k-sys-user.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/340-dl_execstack-PaX-support.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/350-pre20040117-pt_pax.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/360-tests-sandbox-libdl-paths.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/380-dont-build-timezone.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/400-alpha-xstat.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/430-alpha-creat.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/440-alpha-cache-shape.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/460-alpha-fix-gcc-4.1-warnings.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/490-alpha_alpha-add-fdatasync-support.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/530-alpha-fix-rtld-fPIC.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/560-ppc-atomic.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/580-nptl-lowlevellock.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/610-fpu-cw-mips.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/630-mips_shn_undef-hack.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/640-alpha-atfcts.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/650-syslog.patch (100%) rename packages/{glibc/ports-2.14 => glibc-ports/2.14}/660-debug-readlink_chk-readklinkat_chk.patch (100%) create mode 100644 packages/glibc-ports/2.14/version.desc rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/090-Fix-ARM-build-with-GCC-trunk.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/091-libmemusage-link-failure.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/100-respect-env-CPPFLAGS.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/120-i386-x86_64-revert-clone-cfi.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/140-disable-ldconfig.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/150-queue-header-updates.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/160-manual-no-perl.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/170-localedef-fix-trampoline.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/180-resolv-dynamic.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/200-fadvise64_64.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/220-section-comments.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/230-no-inline-gmon.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/260-assume-pipe2.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/270-china.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/280-new-valencian-locale.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/300-nscd-one-fork.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/310-hppa-nptl-carlos.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/330-m68k-sys-user.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/340-dl_execstack-PaX-support.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/350-pre20040117-pt_pax.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/360-tests-sandbox-libdl-paths.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/380-dont-build-timezone.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/400-alpha-xstat.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/430-alpha-creat.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/440-alpha-cache-shape.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/460-alpha-fix-gcc-4.1-warnings.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/490-alpha_alpha-add-fdatasync-support.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/530-alpha-fix-rtld-fPIC.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/560-ppc-atomic.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/580-nptl-lowlevellock.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/610-fpu-cw-mips.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/630-mips_shn_undef-hack.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/640-alpha-atfcts.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/650-syslog.patch (100%) rename packages/{glibc/ports-2.15 => glibc-ports/2.15}/660-debug-readlink_chk-readklinkat_chk.patch (100%) create mode 100644 packages/glibc-ports/2.15/version.desc rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/090-Fix-ARM-build-with-GCC-trunk.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/100-respect-env-CPPFLAGS.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/120-i386-x86_64-revert-clone-cfi.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/140-disable-ldconfig.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/150-queue-header-updates.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/170-localedef-fix-trampoline.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/180-resolv-dynamic.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/200-fadvise64_64.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/260-assume-pipe2.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/270-china.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/280-new-valencian-locale.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/300-nscd-one-fork.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/310-hppa-nptl-carlos.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/330-m68k-sys-user.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/340-dl_execstack-PaX-support.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/350-pre20040117-pt_pax.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/360-tests-sandbox-libdl-paths.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/380-dont-build-timezone.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/400-alpha-xstat.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/430-alpha-creat.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/440-alpha-cache-shape.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/460-alpha-fix-gcc-4.1-warnings.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/490-alpha_alpha-add-fdatasync-support.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/530-alpha-fix-rtld-fPIC.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/560-ppc-atomic.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/580-nptl-lowlevellock.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/610-fpu-cw-mips.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/630-mips_shn_undef-hack.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/640-alpha-atfcts.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/650-syslog.patch (100%) rename packages/{glibc/ports-2.16.0 => glibc-ports/2.16.0}/660-debug-readlink_chk-readklinkat_chk.patch (100%) create mode 100644 packages/glibc-ports/2.16.0/version.desc create mode 100644 packages/glibc-ports/package.desc rename scripts/build/cc/{100-gcc.sh => gcc.sh} (96%) diff --git a/Makefile.in b/Makefile.in index 0f32064a..8f7821ca 100644 --- a/Makefile.in +++ b/Makefile.in @@ -148,7 +148,7 @@ distclean: clean $(call __silent_rm,Makefile kconfig/Makefile config/configure.in) mrproper: distclean - $(call __silent_rmdir,autom4te.cache config/gen) + $(call __silent_rmdir,autom4te.cache config/gen config/versions) $(call __silent_rm,config.log config.status configure) uninstall: real-uninstall diff --git a/TODO b/TODO index fd91244a..99c1bdaf 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,10 @@ +TBD +packages todo +[ ] mention custom glibc addons are no longer handled (even though they never fully were, ct-ng would be unable to fetch them unless they were secretly placed into the download area) +[ ] mention incompatibility of sample options +[ ] version-locked packages + [ ] make glibc-ports package for glibc <2.17 (it has its own repo) + A (slightly) ordered set of tasks for crosstool-NG. Written in a cryptic language; contact me if you want to help with any of these :) -- Alexey Neyman (@stilor) @@ -6,9 +13,11 @@ A (slightly) ordered set of tasks for crosstool-NG. Written in a cryptic languag [ ] linux [ ] mingw-w64 [ ] newlib + [ ] gcc-linaro [ ] clean up GDB versions - no X.Y if X.Y.1 is present [ ] Check other packages, leave only the most recent on each branch [ ] arm_neon.h - offer as a companion "library" for the target +[ ] gdbinit (installed if CT_GDB_INSTALL_GDBINIT is set) is not relocatable, contains absolute paths [ ] FreeBSD [ ] Use 'cc' rather than 'gcc' on the host [ ] Detect in configure what the default value is diff --git a/config/binutils.in b/config/binutils.in index 0c6d5c00..7210f7c0 100644 --- a/config/binutils.in +++ b/config/binutils.in @@ -33,9 +33,6 @@ config ARCH_BINFMT_FDPIC endchoice -config BINUTILS - string - source "config/gen/binutils.in" source "config/gen/binutils.in.2" diff --git a/config/cc.in b/config/cc.in index 03bc8d70..62aee4bb 100644 --- a/config/cc.in +++ b/config/cc.in @@ -2,13 +2,6 @@ menu "C compiler" -config CC - string - default "gcc" - -config CC_VERSION - string - config CC_CORE_PASSES_NEEDED bool select CC_CORE_PASS_1_NEEDED @@ -20,8 +13,6 @@ config CC_CORE_PASS_1_NEEDED config CC_CORE_PASS_2_NEEDED bool -source "config/gen/cc.in" - config CC_SUPPORT_CXX bool @@ -43,6 +34,8 @@ config CC_SUPPORT_OBJCXX config CC_SUPPORT_GOLANG bool +source "config/gen/cc.in" + comment "Additional supported languages:" config CC_LANG_CXX diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2 index e238076d..36ae9395 100644 --- a/config/cc/gcc.in.2 +++ b/config/cc/gcc.in.2 @@ -7,6 +7,11 @@ config CC_GCC_ENABLE_PLUGINS depends on ! STATIC_TOOLCHAIN default y +# Affects the build of musl +config GCC_BUG_61144 + bool + default y if GCC_4_9_or_later && !GCC_4_9_2_or_later + # If binutils installs gold, enable support for gold in gcc config CC_GCC_GOLD bool @@ -133,7 +138,7 @@ comment "Optimisation features" config CC_GCC_USE_GRAPHITE bool "Enable GRAPHITE loop optimisations" default y - select CLOOG_NEEDED if !CC_GCC_5_or_later + select CLOOG_NEEDED if !GCC_5_or_later select ISL_NEEDED help Enable the GRAPHITE loop optimsations. diff --git a/config/kernel.in b/config/kernel.in index 2ae7656a..31e83fc4 100644 --- a/config/kernel.in +++ b/config/kernel.in @@ -18,12 +18,6 @@ config WINDOWS config KERNEL_SUPPORTS_SHARED_LIBS bool -config KERNEL - string - -config KERNEL_VERSION - string - source "config/gen/kernel.in" comment "Common kernel options" diff --git a/config/libc.in b/config/libc.in index 708c3b6f..62490b9d 100644 --- a/config/libc.in +++ b/config/libc.in @@ -2,23 +2,6 @@ menu "C-library" -config LIBC - string - -config LIBC_VERSION - string - help - Enter the date of the snapshot you want to use in the form: YYYYMMDD - where YYYY is the 4-digit year, MM the 2-digit month and DD the 2-digit - day in the month. - - Please note: - - glibc has snapshots done every monday, and only the last ten are kept. - - uClibc has daily snapshots, and only the last 30-or-so are kept. - - So if you want to be able to re-build your toolchain later, you will - have to save your C library tarball by yourself. - source "config/gen/libc.in" config LIBC_SUPPORT_THREADS_ANY diff --git a/config/libc/bionic.in b/config/libc/bionic.in index ab51e6b9..6bf708b5 100644 --- a/config/libc/bionic.in +++ b/config/libc/bionic.in @@ -3,7 +3,7 @@ ## depends on ! WINDOWS && ! BARE_METAL ## depends on ARCH_arm || ARCH_mips || ARCH_x86 ## depends on EXPERIMENTAL -## depends on CC_GCC_6_or_later +## depends on GCC_6_or_later ## ## select LIBC_SUPPORT_THREADS_POSIX ## diff --git a/config/libc/glibc.in b/config/libc/glibc.in index c0c633dd..803ba297 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -1,9 +1,13 @@ # glibc options +# TBD move all the remaining parts into glibc.in.2 and move the sourcing of versions +# into the auto-generated choice/menus? + ## depends on ! WINDOWS && ! BARE_METAL && ARCH_USE_MMU ## ## select LIBC_SUPPORT_THREADS_NATIVE ## select CC_CORE_PASSES_NEEDED +# TBD: select GETTEXT for build only, not for host ## select GETTEXT_NEEDED ## select BINUTILS_FORCE_LD_BFD_DEFAULT ## @@ -16,39 +20,6 @@ # are still using quite ancient versions. Please do not retire versions # (including versions in between) until the EOL dates indicated in version.desc. source "config/versions/glibc.in" - -config THREADS - default "nptl" - -# SPARCv8 support retired in 2.23 -config GLIBC_NO_SPARC_V8 - def_bool y - depends on GLIBC_2_23_or_later - -# With 2.20, NPTL is in default glibc -config GLIBC_HAS_NPTL_ADDON - def_bool y - depends on !GLIBC_2_20_or_later - -# With 2.20, all architectures are in main tree -config GLIBC_HAS_PORTS_ADDON - def_bool y - depends on !GLIBC_2_20_or_later - -# With 2.17 and later, 'ports' addon is shipped in glibc tarball -config GLIBC_PORTS_EXTERNAL - def_bool y - depends on !GLIBC_2_17_or_later - -# Some architectures require the ports addon. List them one by one here: -# This list must be carefully in sync with the architectures names -# we can find in config/arch/* -config GLIBC_NEEDS_PORTS - def_bool y - depends on ARCH_alpha || ARCH_arm || ARCH_m68k || ARCH_mips || ARCH_powerpc - -# Ports are no longer an add-on starting with 2.20 -config GLIBC_USE_PORTS - def_bool y - depends on GLIBC_NEEDS_PORTS && GLIBC_HAS_PORTS_ADDON - +if GLIBC_USE_PORTS_EXTERNAL +source "config/versions/glibc-ports.in" +endif diff --git a/config/libc/glibc.in.2 b/config/libc/glibc.in.2 index f1c224cf..7785aca3 100644 --- a/config/libc/glibc.in.2 +++ b/config/libc/glibc.in.2 @@ -1,6 +1,70 @@ # This file contains the common configuration options # that apply to both glibc. +config THREADS + default "nptl" + +# Known add-ons and when they exist(ed) +# crypt external in 2.1, no longer an add-on since 2.2 +# libidn external in 2.3.4 .. 2.10, still an add-on +# linuxthreads external in 2.0.1 .. 2.5, no longer available since 2.6 [*] +# localedata external in 2.0.1 .. 2.0.6, no longer an add-on since 2.1 [*] +# ports external in 2.3.4 .. 2.16, no longer an add-on since 2.20 +# nptl never external, no longer an add-on since 2.20 +# +# Given the list of currently supported glibc releases, we only need to worry about +# 'libidn', 'ports' and 'nptl' add-ons. Of these, only 'ports' can be an external +# tarball; and only 'libidn' is user-selectable ('ports' & 'nptl' are selected +# by crosstool-NG, as dictated by the architecture and thread model). +# +# I had trouble locating the sources in the repository for some of the released +# versions. E.g., there is a 2.5 version of linuxthreads, but the tag for 2.5 in Git +# does not have the linuxthreads directory at all. Similarly, 2.0.6 tag did not have +# localedata. Since these releases are no longer supported by crosstool-NG, this is +# of pure historical interest now, however. + +config GLIBC_HAS_NPTL_ADDON + def_bool y + depends on !GLIBC_2_20_or_later + +config GLIBC_HAS_PORTS_ADDON + def_bool y + depends on !GLIBC_2_20_or_later + +config GLIBC_HAS_PORTS_ADDON_EXTERNAL + def_bool y + depends on !GLIBC_2_17_or_later + +# In case it folds into main distribution in some future release, too +config GLIBC_HAS_LIBIDN_ADDON + def_bool y + +# Some architectures require the ports addon. List them one by one here: +# This list must be carefully in sync with the architectures names +# we can find in config/arch/* +config GLIBC_USE_PORTS_ADDON + def_bool y + depends on ARCH_alpha || ARCH_arm || ARCH_m68k || ARCH_mips || ARCH_powerpc + depends on GLIBC_HAS_PORTS_ADDON + +config GLIBC_USE_PORTS_EXTERNAL + def_bool y + depends on GLIBC_USE_PORTS_ADDON && GLIBC_HAS_PORTS_ADDON_EXTERNAL + +config GLIBC_USE_NPTL_ADDON + def_bool y + depends on THREADS_NATIVE && GLIBC_HAS_NPTL_ADDON + +config GLIBC_USE_LIBIDN_ADDON + bool "Build libidn add-on" + help + Enables the libidn add-on in GNU libc. + +# SPARCv8 support retired in 2.23 +config GLIBC_NO_SPARC_V8 + def_bool y + depends on GLIBC_2_23_or_later + config GLIBC_EXTRA_CONFIG_ARRAY string prompt "extra config" @@ -88,22 +152,6 @@ config GLIBC_FORCE_UNWIND of glibc on some architectures (seen on s390, s390x and x86_64). -config GLIBC_ADDONS_LIST - string - prompt "Extra addons" - default "" - help - Extra addons to include. Space separated list. - - You need to specify neither linuxthreads nor nptl, as they are added - automagically for you depending on the threading model you chose - earlier and on libc version selected. - - Also, do not specify ports even if applicable to the selected libc - version/architecture; it is selected automatically. - - Eg.: libidn - config GLIBC_LOCALES bool prompt "Build and install locales" @@ -111,7 +159,7 @@ config GLIBC_LOCALES Whether to build and install the libc locale files for the target, which is required in order to support internationalization. -if LIBC_glibc && LIBC_LOCALES +if LIBC_glibc && GLIBC_LOCALES comment "WARNING! " comment "| The built locales will be usable if and only if the build " comment "| machine and the target: " @@ -121,7 +169,7 @@ comment "| You will have to check by yourself (for now). " comment "WARNING! " comment "| Building GLIBC locales requires that GLIBC supports " comment "| the build machine as the target. " -endif # LIBC_glibc && LIBC_LOCALES +endif # LIBC_glibc && GLIBC_LOCALES if KERNEL_linux @@ -215,7 +263,7 @@ endchoice config GLIBC_MIN_KERNEL string default "" if GLIBC_KERNEL_VERSION_NONE - default KERNEL_VERSION if GLIBC_KERNEL_VERSION_AS_HEADERS + default LINUX_VERSION if GLIBC_KERNEL_VERSION_AS_HEADERS default GLIBC_MIN_KERNEL_VERSION if GLIBC_KERNEL_VERSION_CHOSEN endif # KERNEL_linux diff --git a/config/libc/newlib.in b/config/libc/newlib.in index 5354fef9..a37eca7a 100644 --- a/config/libc/newlib.in +++ b/config/libc/newlib.in @@ -21,3 +21,11 @@ config NEWLIB_CXA_ATEXIT def_bool y depends on NEWLIB_2_0_or_later select LIBC_PROVIDES_CXA_ATEXIT + +config NEWLIB_HAS_NANO_MALLOC + def_bool y + depends on NEWLIB_2_1_or_later + +config NEWLIB_HAS_NANO_FORMATTED_IO + def_bool y + depends on NEWLIB_2_2_or_later diff --git a/config/libc/newlib.in.2 b/config/libc/newlib.in.2 index f73128c3..ed27e7a9 100644 --- a/config/libc/newlib.in.2 +++ b/config/libc/newlib.in.2 @@ -164,7 +164,7 @@ config LIBC_NEWLIB_LTO config LIBC_NEWLIB_NANO_MALLOC bool prompt "Enable Nano Malloc" - depends on LIBC_NEWLIB_2_1_or_later + depends on NEWLIB_HAS_NANO_MALLOC help NEWLIB has two implementations of malloc family's functions, one in `mallocr.c' and the other one in `nano-mallocr.c'. This options @@ -175,7 +175,7 @@ config LIBC_NEWLIB_NANO_MALLOC config LIBC_NEWLIB_NANO_FORMATTED_IO bool prompt "Enable Nano Formatted I/O" - depends on LIBC_NEWLIB_2_2_or_later + depends on NEWLIB_HAS_NANO_FORMATTED_IO help This builds NEWLIB with a special implementation of formatted I/O functions, designed to lower the size of application on small systems diff --git a/config/target.in b/config/target.in index 50aaa615..3d86b557 100644 --- a/config/target.in +++ b/config/target.in @@ -2,9 +2,6 @@ menu "Target options" -config ARCH - string - source "config/gen/arch.in" config ARCH_SUFFIX diff --git a/maintainer/gen-kconfig.sh b/maintainer/gen-kconfig.sh index 4066fbbb..096599ca 100755 --- a/maintainer/gen-kconfig.sh +++ b/maintainer/gen-kconfig.sh @@ -81,6 +81,7 @@ gen_choice() { printf '\n' printf 'config %s\n' "${cfg_prefix}" + printf ' string\n' for entry in `get_components ${base_dir}`; do file="${base_dir}/${entry}.in" _entry=$(printf '%s\n' "${entry}" |"${sed}" -r -s -e 's/[-.+]/_/g;') diff --git a/maintainer/gen-versions.sh b/maintainer/gen-versions.sh index 99e97918..cd994326 100755 --- a/maintainer/gen-versions.sh +++ b/maintainer/gen-versions.sh @@ -1,7 +1,21 @@ #!/bin/bash ######################################## -# Common meta-language implementation +# Common meta-language implementation. Syntax: +# +# The template file is processed line by line, with @@VAR@@ placeholders +# being replaced with a value of the VAR variable. +# Special lines start with '#!' and a keyword: +# +# #!// +# Comment, the rest of the line is ignored +# #!if COND +# Conditional: the lines until the matching #!end-if are processed +# only if the conditional COND evaluates to true. +# #!foreach NAME +# Iterate over NAME entities (the iterator must be set up first +# using the set_iter function), processing the lines until the matching +# #!end-foreach line. declare -A info @@ -12,7 +26,7 @@ debug() fi } -info() +msg() { if [ -z "${QUIET}" ]; then echo "INFO :: $@" >&2 @@ -125,7 +139,7 @@ run_lines() while [ "${l}" -le "${end}" ]; do lnext=$[l+1] s="${tlines[${l}]}" - # Expand @@foo@@ to ${info[foo]}. First escape quotes/backslashes. + # Expand @@foo@@ to ${info[foo]}. First escape variables/backslashes for evals below. s="${s//\\/\\\\}" s="${s//\$/\\\$}" while [ -n "${s}" ]; do @@ -352,13 +366,28 @@ sort_versions() read_file() { - local l + local l p while read l; do + l="${p}${l}" + p= case "${l}" in - "#"*) continue;; - *=*) echo "info[${l%%=*}]=${l#*=}";; - *) error "syntax error in '${1}': '${l}'" + "") + continue + ;; + *\\) + p="${l%\\}" + continue + ;; + "#"*) + continue + ;; + *=*) + echo "info[${l%%=*}]=${l#*=}" + ;; + *) + error "syntax error in '${1}': '${l}'" + ;; esac done < "${1}" } @@ -410,6 +439,7 @@ enter_fork() info[repository_cset]=HEAD info[fork]=${fork} info[name]=${fork} + info[mirrors]= eval `read_package_desc ${fork}` @@ -426,6 +456,7 @@ enter_fork() info[repository_url]=${info[repository]##* } info[repository_dflt_branch]=${dflt_branch[${info[vcs]}]} fi + info[versionlocked]=`kconfigize "${info[versionlocked]}"` versions=`cd packages/${fork} && \ for f in */version.desc; do [ -r "${f}" ] && echo "${f%/version.desc}"; done` @@ -449,13 +480,6 @@ enter_fork() fi } -set_latest_milestone() -{ - if [ `cmp_versions ${info[ms]} ${info[ver]}` -le 0 -a -z "${milestone}" ]; then - milestone=${info[ms_kcfg]} - fi -} - enter_version() { local -A ver_postfix=( \ @@ -463,35 +487,23 @@ enter_version() [,,yes,]=" (EXPERIMENTAL)" \ [,yes,yes,]=" (OBSOLETE,EXPERIMENTAL)" ) local version="${1}" - local tmp milestone eval `read_version_desc ${info[fork]} ${version}` info[ver]=${version} info[kcfg]=`kconfigize ${version}` info[ver_postfix]=${ver_postfix[,${info[obsolete]},${info[experimental]},]} - - # TBD do we need "prev" version? - tmp=" ${info[all_versions]} " - tmp=${tmp##* ${version} } - info[prev]=`kconfigize ${tmp%% *}` - - # Find the latest milestone preceding this version - milestone= - do_foreach milestone set_latest_milestone - info[milestone]=${milestone} } enter_milestone() { local ms="${1}" - local tmp + local cmp info[ms]=${ms} info[ms_kcfg]=`kconfigize ${ms}` - - tmp=" ${info[all_milestones]} " - tmp=${tmp##* ${ms} } - info[ms_prev]=`kconfigize ${tmp%% *}` + if [ -n "${info[ver]}" ]; then + info[version_cmp_milestone]=`cmp_versions ${info[ver]} ${info[ms]}` + fi } rm -rf "${config_dir}" @@ -502,7 +514,7 @@ pkg_all=( `cd packages && \ while read f; do [ -r "${f}" ] && echo "${f%/package.desc}"; done | \ xargs echo` ) -info "Generating package version descriptions" +msg "Generating package version descriptions" debug "Packages: ${pkg_all[@]}" # We need to group forks of the same package into the same @@ -511,12 +523,12 @@ debug "Packages: ${pkg_all[@]}" for p in "${pkg_all[@]}"; do find_forks "${p}" done -info "Master packages: ${pkg_masters[@]}" +msg "Master packages: ${pkg_masters[@]}" # Now for each master, create its kconfig file with version # definitions. for p in "${pkg_masters[@]}"; do - info "Generating '${config_dir}/${p}.in'" + msg "Generating '${config_dir}/${p}.in'" exec >"${config_dir}/${p}.in" # Base definitions for the whole config file info=( \ @@ -532,4 +544,4 @@ for p in "${pkg_masters[@]}"; do # TBD get rid of the "origin" completely and use just the fork name? run_template "${template}" done -info "Done!" +msg "Done!" diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template index c6d001e1..9343f18c 100644 --- a/maintainer/kconfig-versions.template +++ b/maintainer/kconfig-versions.template @@ -58,19 +58,6 @@ config @@pfx@@_SRC_DEVEL Check out from vendor repository at: @@repository_url@@ -#!end-if -config @@pfx@@_SRC_CUSTOM - bool "Custom location" - depends on EXPERIMENTAL - help - Custom directory or tarball. - -endchoice -#!if [ -n "@@all_versions@@" ] -endif -#!end-if - -#!if [ -n "@@repository@@" ] if @@pfx@@_SRC_DEVEL config @@pfx@@_DEVEL_VCS @@ -95,7 +82,13 @@ config @@pfx@@_DEVEL_REVISION Commit ID or revision ID to check out. endif + #!end-if +config @@pfx@@_SRC_CUSTOM + bool "Custom location" + depends on EXPERIMENTAL + help + Custom directory or tarball. if @@pfx@@_SRC_CUSTOM @@ -106,9 +99,40 @@ config @@pfx@@_CUSTOM_LOCATION endif +endchoice #!if [ -n "@@all_versions@@" ] +endif + +config @@pfx@@_MIRRORS_ARRAY + string + default "@@mirrors@@" +#!end-if + +#!// Below, we explicitly select all milestones to which a given version +#!// compares greater-or-equal. We don't select just the latest applicable +#!// (and letting milestones chain-select each other, with FOO_6_or_later +#!// selecting FOO_5_or_later and so on) so that we can handle the cases +#!// where we need to identify a range of releases on a branch, for example, +#!// "all FOO releases after 4.9.1 but before 4.9.3". +#!// +#!if [ -n "@@all_versions@@" -a -z "@@versionlocked@@" ] choice bool "Version of @@name@@" + help + For a released version, select the version of @@name@@ 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@@. + +config @@pfx@@_VERY_NEW + bool "newer than anything below" + depends on EXPERIMENTAL + depends on @@pfx@@_SRC_DEVEL || @@pfx@@_SRC_CUSTOM +#!foreach milestone + select @@masterpfx@@_@@ms_kcfg@@_or_later + depends on !@@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_older +#!end-foreach #!foreach version config @@pfx@@_V_@@kcfg@@ @@ -119,14 +143,39 @@ config @@pfx@@_V_@@kcfg@@ #!if [ "@@experimental@@" = "yes" ] depends on EXPERIMENTAL #!end-if -#!if [ -n "@@milestone@@" ] - select @@masterpfx@@_@@milestone@@_or_later +#!foreach milestone +#!if [ "@@version_cmp_milestone@@" -ge 0 ] + select @@masterpfx@@_@@ms_kcfg@@_or_later #!end-if +#!if [ "@@version_cmp_milestone@@" -gt 0 ] + depends on !@@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_older +#!end-if +#!if [ "@@version_cmp_milestone@@" -lt 0 ] + depends on !@@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_later +#!end-if +#!end-foreach #!end-foreach +config @@pfx@@_VERY_OLD + bool "older than anything above" + depends on OBSOLETE && EXPERIMENTAL + depends on @@pfx@@_SRC_DEVEL || @@pfx@@_SRC_CUSTOM +#!foreach milestone + depends on !@@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_later +#!end-foreach + endchoice #!end-if +#!if [ -n "@@versionlocked@@" ] +#!foreach version +config @@pfx@@_V_@@kcfg@@ + def_bool y + depends on @@versionlocked@@_V_@@kcfg@@ + +#!end-foreach +#!end-if + #!if [ "@@nforks@@" -ge 2 ] endif #!end-if @@ -141,10 +190,16 @@ config @@pfx@@_VERSION #!end-foreach #!foreach milestone +#!// Milestones selected by a chosen version of this package config @@masterpfx@@_@@ms_kcfg@@_or_later bool -#!if [ -n "@@ms_prev@@" ] - select @@masterpfx@@_@@ms_prev@@_or_later -#!end-if + +#!// Milestone requirements selected by other packages that restrict +#!// the choices in this package +config @@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_later + bool + +config @@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_older + bool #!end-foreach diff --git a/packages/autoconf/package.desc b/packages/autoconf/package.desc index bfec1252..27ac6c3a 100644 --- a/packages/autoconf/package.desc +++ b/packages/autoconf/package.desc @@ -1 +1,2 @@ -repository="git git://git.sv.gnu.org/autoconf" +repository='git git://git.sv.gnu.org/autoconf' +mirrors='$(CT_Mirrors GNU autoconf)' diff --git a/packages/autoconf/version.desc b/packages/autoconf/version.desc index 026d275e..fcfe3891 100644 --- a/packages/autoconf/version.desc +++ b/packages/autoconf/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/automake/1.11.1/version.desc b/packages/automake/1.11.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/automake/1.11.1/version.desc +++ b/packages/automake/1.11.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/automake/1.11.6/version.desc b/packages/automake/1.11.6/version.desc index 026d275e..fcfe3891 100644 --- a/packages/automake/1.11.6/version.desc +++ b/packages/automake/1.11.6/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/automake/1.14/version.desc b/packages/automake/1.14/version.desc index 026d275e..fcfe3891 100644 --- a/packages/automake/1.14/version.desc +++ b/packages/automake/1.14/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/automake/package.desc b/packages/automake/package.desc index ba73596a..7400a0fc 100644 --- a/packages/automake/package.desc +++ b/packages/automake/package.desc @@ -1 +1,2 @@ -repository="git https://git.savannah.gnu.org/git/automake.git" +repository='git https://git.savannah.gnu.org/git/automake.git' +mirrors='$(CT_Mirrors GNU automake)' diff --git a/packages/avr-libc/1.8.0/version.desc b/packages/avr-libc/1.8.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/avr-libc/1.8.0/version.desc +++ b/packages/avr-libc/1.8.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/avr-libc/package.desc b/packages/avr-libc/package.desc index fa9571e3..8976862e 100644 --- a/packages/avr-libc/package.desc +++ b/packages/avr-libc/package.desc @@ -1 +1,2 @@ -repository="svn svn://svn.savannah.nongnu.org/avr-libc/trunk/avr-libc" +repository='svn svn://svn.savannah.nongnu.org/avr-libc/trunk/avr-libc' +mirrors='http://download.savannah.gnu.org/releases/avr-libc' diff --git a/packages/binutils-linaro/2.23.2-2013.10-4/version.desc b/packages/binutils-linaro/2.23.2-2013.10-4/version.desc index 026d275e..fcfe3891 100644 --- a/packages/binutils-linaro/2.23.2-2013.10-4/version.desc +++ b/packages/binutils-linaro/2.23.2-2013.10-4/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/binutils-linaro/2.24.0-2014.11-2/version.desc b/packages/binutils-linaro/2.24.0-2014.11-2/version.desc index 026d275e..fcfe3891 100644 --- a/packages/binutils-linaro/2.24.0-2014.11-2/version.desc +++ b/packages/binutils-linaro/2.24.0-2014.11-2/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/binutils-linaro/2.25.0-2015.01-2/version.desc b/packages/binutils-linaro/2.25.0-2015.01-2/version.desc index 026d275e..fcfe3891 100644 --- a/packages/binutils-linaro/2.25.0-2015.01-2/version.desc +++ b/packages/binutils-linaro/2.25.0-2015.01-2/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/binutils-linaro/package.desc b/packages/binutils-linaro/package.desc index 5adfd4e1..ea5dc66c 100644 --- a/packages/binutils-linaro/package.desc +++ b/packages/binutils-linaro/package.desc @@ -1,5 +1,5 @@ -master="binutils" -repository="git https://git.linaro.org/toolchain/binutils-gdb.git" -download="TBD" -origin="Linaro" -experimental="yes" +master='binutils' +repository='git https://git.linaro.org/toolchain/binutils-gdb.git' +mirrors='$(CT_Mirrors Linaro binutils ${CT_BINUTILS_LINARO_VERSION})' +origin='Linaro' +experimental='yes' diff --git a/packages/binutils/2.23.2/version.desc b/packages/binutils/2.23.2/version.desc index 026d275e..fcfe3891 100644 --- a/packages/binutils/2.23.2/version.desc +++ b/packages/binutils/2.23.2/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/binutils/2.24/version.desc b/packages/binutils/2.24/version.desc index 026d275e..fcfe3891 100644 --- a/packages/binutils/2.24/version.desc +++ b/packages/binutils/2.24/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/binutils/2.25.1/version.desc b/packages/binutils/2.25.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/binutils/2.25.1/version.desc +++ b/packages/binutils/2.25.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/binutils/package.desc b/packages/binutils/package.desc index 54845f86..6854ee97 100644 --- a/packages/binutils/package.desc +++ b/packages/binutils/package.desc @@ -1,4 +1,4 @@ -repository="git git://sourceware.org/git/binutils-gdb.git" -download_url="TBD other mirrors https://ftp.gnu.org/gnu/binutils/binutils-${version}.${format}" -origin="GNU" -milestones="2.23" +repository='git git://sourceware.org/git/binutils-gdb.git' +mirrors='$(CT_Mirrors GNU binutils) $(CT_Mirrors GCC_GNU binutils) $(CT_Mirrors sourceware)' +origin='GNU' +milestones='2.23' diff --git a/packages/bionic/10e/version.desc b/packages/bionic/10e/version.desc index 026d275e..fcfe3891 100644 --- a/packages/bionic/10e/version.desc +++ b/packages/bionic/10e/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/bionic/11c/version.desc b/packages/bionic/11c/version.desc index 026d275e..fcfe3891 100644 --- a/packages/bionic/11c/version.desc +++ b/packages/bionic/11c/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/bionic/12b/version.desc b/packages/bionic/12b/version.desc index 026d275e..fcfe3891 100644 --- a/packages/bionic/12b/version.desc +++ b/packages/bionic/12b/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/bionic/13b/version.desc b/packages/bionic/13b/version.desc index 026d275e..fcfe3891 100644 --- a/packages/bionic/13b/version.desc +++ b/packages/bionic/13b/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/bionic/15-beta2/version.desc b/packages/bionic/15-beta2/version.desc index 03502fc9..76f14476 100644 --- a/packages/bionic/15-beta2/version.desc +++ b/packages/bionic/15-beta2/version.desc @@ -1 +1 @@ -experimental="yes" +experimental='yes' diff --git a/packages/bionic/package.desc b/packages/bionic/package.desc index fe2c7727..6e3d374a 100644 --- a/packages/bionic/package.desc +++ b/packages/bionic/package.desc @@ -1 +1,2 @@ # We don't support building bionic (yet) so no official repository +mirrors='https://dl.google.com/android/repository' diff --git a/packages/cloog/0.18.0/version.desc b/packages/cloog/0.18.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/cloog/0.18.0/version.desc +++ b/packages/cloog/0.18.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/cloog/0.18.1/version.desc b/packages/cloog/0.18.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/cloog/0.18.1/version.desc +++ b/packages/cloog/0.18.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/cloog/package.desc b/packages/cloog/package.desc index c5b98b7c..ac3c29a0 100644 --- a/packages/cloog/package.desc +++ b/packages/cloog/package.desc @@ -1,3 +1,4 @@ -name="CLooG" -repository="git git://repo.or.cz/cloog.git" -milestones="0.18" +name='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' diff --git a/packages/duma/package.desc b/packages/duma/package.desc index a48afdd4..efedb9ed 100644 --- a/packages/duma/package.desc +++ b/packages/duma/package.desc @@ -1 +1,2 @@ -repository="cvs :pserver:anonymous@duma.cvs.sourceforge.net:/cvsroot/duma" +repository='cvs :pserver:anonymous@duma.cvs.sourceforge.net:/cvsroot/duma' +mirrors='http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION}' diff --git a/packages/elf2flt/package.desc b/packages/elf2flt/package.desc index a3b9dc23..c46788c1 100644 --- a/packages/elf2flt/package.desc +++ b/packages/elf2flt/package.desc @@ -1,2 +1,2 @@ -repository="git https://github.com/uclinux-dev/elf2flt.git" -repository_cset="6d80ab6c93409e796f85da404bde84b841231531" +repository='git https://github.com/uclinux-dev/elf2flt.git' +repository_cset='6d80ab6c93409e796f85da404bde84b841231531' diff --git a/packages/expat/2.1.1/version.desc b/packages/expat/2.1.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/expat/2.1.1/version.desc +++ b/packages/expat/2.1.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/expat/package.desc b/packages/expat/package.desc index f9e53c61..d1bfcf93 100644 --- a/packages/expat/package.desc +++ b/packages/expat/package.desc @@ -1 +1,2 @@ -repository="git https://github.com/libexpat/libexpat.git" +repository='git https://github.com/libexpat/libexpat.git' +mirrors='http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}' diff --git a/packages/gcc-linaro/4.8-2015.06/version.desc b/packages/gcc-linaro/4.8-2015.06/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gcc-linaro/4.8-2015.06/version.desc +++ b/packages/gcc-linaro/4.8-2015.06/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gcc-linaro/6.3-2017.05/1100-ubsan-fix-check-empty-string.patch b/packages/gcc-linaro/6.3-2017.05/1100-ubsan-fix-check-empty-string.patch new file mode 100644 index 00000000..c0127198 --- /dev/null +++ b/packages/gcc-linaro/6.3-2017.05/1100-ubsan-fix-check-empty-string.patch @@ -0,0 +1,28 @@ +From 8db2cf6353c13f2a84cbe49b689654897906c499 Mon Sep 17 00:00:00 2001 +From: kyukhin +Date: Sat, 3 Sep 2016 10:57:05 +0000 +Subject: [PATCH] gcc/ * ubsan.c (ubsan_use_new_style_p): Fix check for empty + string. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239971 138bc75d-0d04-0410-961f-82ee72b054a4 + +Upstream-Status: Backport +Signed-off-by: Joshua Lock + +--- + gcc/ubsan.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +Index: gcc-6.3.0/gcc/ubsan.c +=================================================================== +--- gcc-6.3.0.orig/gcc/ubsan.c ++++ gcc-6.3.0/gcc/ubsan.c +@@ -1471,7 +1471,7 @@ ubsan_use_new_style_p (location_t loc) + + expanded_location xloc = expand_location (loc); + if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0 +- || xloc.file == '\0' || xloc.file[0] == '\xff' ++ || xloc.file[0] == '\0' || xloc.file[0] == '\xff' + || xloc.file[1] == '\xff') + return false; + diff --git a/packages/gcc-linaro/package.desc b/packages/gcc-linaro/package.desc index 126f5f27..1731843f 100644 --- a/packages/gcc-linaro/package.desc +++ b/packages/gcc-linaro/package.desc @@ -1,5 +1,5 @@ -master="gcc" -repository="git https://git.linaro.org/toolchain/gcc.git" -download="TBD" -origin="Linaro" -experimental="yes" +master='gcc' +repository='git https://git.linaro.org/toolchain/gcc.git' +mirrors='$(CT_Mirrors Linaro gcc ${CT_GCC_LINARO_VERSION})' +origin='Linaro' +experimental='yes' diff --git a/packages/gcc/4.8.5/version.desc b/packages/gcc/4.8.5/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gcc/4.8.5/version.desc +++ b/packages/gcc/4.8.5/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gcc/package.desc b/packages/gcc/package.desc index 81afb5b7..c38ead7e 100644 --- a/packages/gcc/package.desc +++ b/packages/gcc/package.desc @@ -1,4 +1,4 @@ -repository="svn svn://gcc.gnu.org/svn/gcc" -download_url="TBD other mirrors ftp://ftp.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.${format}" -origin="GNU" -milestones="4.8 4.9 5 6 7" +repository='svn svn://gcc.gnu.org/svn/gcc' +mirrors='$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc gcc-${CT_GCC_VERSION})' +origin='GNU' +milestones='4.8 4.9 4.9.2 5 6 7' diff --git a/packages/gdb-linaro/7.3-2011.12/version.desc b/packages/gdb-linaro/7.3-2011.12/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb-linaro/7.3-2011.12/version.desc +++ b/packages/gdb-linaro/7.3-2011.12/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb-linaro/7.4-2012.06/version.desc b/packages/gdb-linaro/7.4-2012.06/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb-linaro/7.4-2012.06/version.desc +++ b/packages/gdb-linaro/7.4-2012.06/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb-linaro/7.5-2012.12/version.desc b/packages/gdb-linaro/7.5-2012.12/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb-linaro/7.5-2012.12/version.desc +++ b/packages/gdb-linaro/7.5-2012.12/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb-linaro/7.6.1-2013.10/version.desc b/packages/gdb-linaro/7.6.1-2013.10/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb-linaro/7.6.1-2013.10/version.desc +++ b/packages/gdb-linaro/7.6.1-2013.10/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb-linaro/7.7-2014.05/version.desc b/packages/gdb-linaro/7.7-2014.05/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb-linaro/7.7-2014.05/version.desc +++ b/packages/gdb-linaro/7.7-2014.05/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb-linaro/7.7.1-2014.06-1/version.desc b/packages/gdb-linaro/7.7.1-2014.06-1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb-linaro/7.7.1-2014.06-1/version.desc +++ b/packages/gdb-linaro/7.7.1-2014.06-1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb-linaro/7.8-2014.09/version.desc b/packages/gdb-linaro/7.8-2014.09/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb-linaro/7.8-2014.09/version.desc +++ b/packages/gdb-linaro/7.8-2014.09/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb-linaro/package.desc b/packages/gdb-linaro/package.desc index 1b9bd688..f5ed8fac 100644 --- a/packages/gdb-linaro/package.desc +++ b/packages/gdb-linaro/package.desc @@ -1,5 +1,5 @@ -master="gdb" -repository="git https://git.linaro.org/toolchain/binutils-gdb.git" -download="TBD" -origin="Linaro" -experimental="yes" +master='gdb' +repository='git https://git.linaro.org/toolchain/binutils-gdb.git' +mirrors='$(CT_Mirrors Linaro gdb ${CT_GDB_LINARO_VERSION})' +origin='Linaro' +experimental='yes' diff --git a/packages/gdb/6.8a/version.desc b/packages/gdb/6.8a/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/6.8a/version.desc +++ b/packages/gdb/6.8a/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.0.1a/version.desc b/packages/gdb/7.0.1a/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.0.1a/version.desc +++ b/packages/gdb/7.0.1a/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.0a/version.desc b/packages/gdb/7.0a/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.0a/version.desc +++ b/packages/gdb/7.0a/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.10.1/version.desc b/packages/gdb/7.10.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.10.1/version.desc +++ b/packages/gdb/7.10.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.10/version.desc b/packages/gdb/7.10/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.10/version.desc +++ b/packages/gdb/7.10/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.1a/version.desc b/packages/gdb/7.1a/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.1a/version.desc +++ b/packages/gdb/7.1a/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.2a/version.desc b/packages/gdb/7.2a/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.2a/version.desc +++ b/packages/gdb/7.2a/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.3.1/version.desc b/packages/gdb/7.3.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.3.1/version.desc +++ b/packages/gdb/7.3.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.3a/version.desc b/packages/gdb/7.3a/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.3a/version.desc +++ b/packages/gdb/7.3a/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.4.1/version.desc b/packages/gdb/7.4.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.4.1/version.desc +++ b/packages/gdb/7.4.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.4/version.desc b/packages/gdb/7.4/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.4/version.desc +++ b/packages/gdb/7.4/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.5.1/version.desc b/packages/gdb/7.5.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.5.1/version.desc +++ b/packages/gdb/7.5.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.6.1/version.desc b/packages/gdb/7.6.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.6.1/version.desc +++ b/packages/gdb/7.6.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.7.1/version.desc b/packages/gdb/7.7.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.7.1/version.desc +++ b/packages/gdb/7.7.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.7/version.desc b/packages/gdb/7.7/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.7/version.desc +++ b/packages/gdb/7.7/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.8.1/version.desc b/packages/gdb/7.8.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.8.1/version.desc +++ b/packages/gdb/7.8.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.8/version.desc b/packages/gdb/7.8/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.8/version.desc +++ b/packages/gdb/7.8/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.9.1/version.desc b/packages/gdb/7.9.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.9.1/version.desc +++ b/packages/gdb/7.9.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/7.9/version.desc b/packages/gdb/7.9/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gdb/7.9/version.desc +++ b/packages/gdb/7.9/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gdb/package.desc b/packages/gdb/package.desc index 4753dc11..b9855a59 100644 --- a/packages/gdb/package.desc +++ b/packages/gdb/package.desc @@ -1,3 +1,4 @@ -origin="GNU" -repository="git ssh://sourceware.org/git/binutils-gdb.git" -milestones="7.0 7.2" +origin='GNU' +repository='git ssh://sourceware.org/git/binutils-gdb.git' +mirrors='$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb)' +milestones='7.0 7.2' diff --git a/packages/gettext/0.19.7/version.desc b/packages/gettext/0.19.7/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gettext/0.19.7/version.desc +++ b/packages/gettext/0.19.7/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gettext/package.desc b/packages/gettext/package.desc index 65544195..ccd9f2f0 100644 --- a/packages/gettext/package.desc +++ b/packages/gettext/package.desc @@ -1 +1,2 @@ -repository="git https://git.savannah.gnu.org/git/gettext.git" +repository='git https://git.savannah.gnu.org/git/gettext.git' +mirrors='$(CT_Mirrors GNU gettext)' diff --git a/packages/glibc-linaro/2.20-2014.11/version.desc b/packages/glibc-linaro/2.20-2014.11/version.desc index 026d275e..fcfe3891 100644 --- a/packages/glibc-linaro/2.20-2014.11/version.desc +++ b/packages/glibc-linaro/2.20-2014.11/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/glibc-linaro/package.desc b/packages/glibc-linaro/package.desc index c1f1a95f..91195f4b 100644 --- a/packages/glibc-linaro/package.desc +++ b/packages/glibc-linaro/package.desc @@ -1,4 +1,5 @@ -master="glibc" -origin="Linaro" -repository="git https://git.linaro.org/toolchain/glibc.git" -experimental="yes" +master='glibc' +origin='Linaro' +repository='git https://git.linaro.org/toolchain/glibc.git' +mirrors='$(CT_Mirrors Linaro glibc ${CT_GLIBC_LINARO_VERSION})' +experimental='yes' diff --git a/packages/glibc/ports-2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch similarity index 100% rename from packages/glibc/ports-2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch rename to packages/glibc-ports/2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch diff --git a/packages/glibc/ports-2.12.1/100-respect-env-CPPFLAGS.patch b/packages/glibc-ports/2.12.1/100-respect-env-CPPFLAGS.patch similarity index 100% rename from packages/glibc/ports-2.12.1/100-respect-env-CPPFLAGS.patch rename to packages/glibc-ports/2.12.1/100-respect-env-CPPFLAGS.patch diff --git a/packages/glibc/ports-2.12.1/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc-ports/2.12.1/120-i386-x86_64-revert-clone-cfi.patch similarity index 100% rename from packages/glibc/ports-2.12.1/120-i386-x86_64-revert-clone-cfi.patch rename to packages/glibc-ports/2.12.1/120-i386-x86_64-revert-clone-cfi.patch diff --git a/packages/glibc/ports-2.12.1/140-disable-ldconfig.patch b/packages/glibc-ports/2.12.1/140-disable-ldconfig.patch similarity index 100% rename from packages/glibc/ports-2.12.1/140-disable-ldconfig.patch rename to packages/glibc-ports/2.12.1/140-disable-ldconfig.patch diff --git a/packages/glibc/ports-2.12.1/150-queue-header-updates.patch b/packages/glibc-ports/2.12.1/150-queue-header-updates.patch similarity index 100% rename from packages/glibc/ports-2.12.1/150-queue-header-updates.patch rename to packages/glibc-ports/2.12.1/150-queue-header-updates.patch diff --git a/packages/glibc/ports-2.12.1/160-manual-no-perl.patch b/packages/glibc-ports/2.12.1/160-manual-no-perl.patch similarity index 100% rename from packages/glibc/ports-2.12.1/160-manual-no-perl.patch rename to packages/glibc-ports/2.12.1/160-manual-no-perl.patch diff --git a/packages/glibc/ports-2.12.1/170-localedef-fix-trampoline.patch b/packages/glibc-ports/2.12.1/170-localedef-fix-trampoline.patch similarity index 100% rename from packages/glibc/ports-2.12.1/170-localedef-fix-trampoline.patch rename to packages/glibc-ports/2.12.1/170-localedef-fix-trampoline.patch diff --git a/packages/glibc/ports-2.12.1/180-resolv-dynamic.patch b/packages/glibc-ports/2.12.1/180-resolv-dynamic.patch similarity index 100% rename from packages/glibc/ports-2.12.1/180-resolv-dynamic.patch rename to packages/glibc-ports/2.12.1/180-resolv-dynamic.patch diff --git a/packages/glibc/ports-2.12.1/190-localedef-mmap.patch b/packages/glibc-ports/2.12.1/190-localedef-mmap.patch similarity index 100% rename from packages/glibc/ports-2.12.1/190-localedef-mmap.patch rename to packages/glibc-ports/2.12.1/190-localedef-mmap.patch diff --git a/packages/glibc/ports-2.12.1/200-fadvise64_64.patch b/packages/glibc-ports/2.12.1/200-fadvise64_64.patch similarity index 100% rename from packages/glibc/ports-2.12.1/200-fadvise64_64.patch rename to packages/glibc-ports/2.12.1/200-fadvise64_64.patch diff --git a/packages/glibc/ports-2.12.1/220-section-comments.patch b/packages/glibc-ports/2.12.1/220-section-comments.patch similarity index 100% rename from packages/glibc/ports-2.12.1/220-section-comments.patch rename to packages/glibc-ports/2.12.1/220-section-comments.patch diff --git a/packages/glibc/ports-2.12.1/230-no-inline-gmon.patch b/packages/glibc-ports/2.12.1/230-no-inline-gmon.patch similarity index 100% rename from packages/glibc/ports-2.12.1/230-no-inline-gmon.patch rename to packages/glibc-ports/2.12.1/230-no-inline-gmon.patch diff --git a/packages/glibc/ports-2.12.1/240-check_native-headers.patch b/packages/glibc-ports/2.12.1/240-check_native-headers.patch similarity index 100% rename from packages/glibc/ports-2.12.1/240-check_native-headers.patch rename to packages/glibc-ports/2.12.1/240-check_native-headers.patch diff --git a/packages/glibc/ports-2.12.1/250-fix-pr631.patch b/packages/glibc-ports/2.12.1/250-fix-pr631.patch similarity index 100% rename from packages/glibc/ports-2.12.1/250-fix-pr631.patch rename to packages/glibc-ports/2.12.1/250-fix-pr631.patch diff --git a/packages/glibc/ports-2.12.1/260-assume-pipe2.patch b/packages/glibc-ports/2.12.1/260-assume-pipe2.patch similarity index 100% rename from packages/glibc/ports-2.12.1/260-assume-pipe2.patch rename to packages/glibc-ports/2.12.1/260-assume-pipe2.patch diff --git a/packages/glibc/ports-2.12.1/270-china.patch b/packages/glibc-ports/2.12.1/270-china.patch similarity index 100% rename from packages/glibc/ports-2.12.1/270-china.patch rename to packages/glibc-ports/2.12.1/270-china.patch diff --git a/packages/glibc/ports-2.12.1/280-new-valencian-locale.patch b/packages/glibc-ports/2.12.1/280-new-valencian-locale.patch similarity index 100% rename from packages/glibc/ports-2.12.1/280-new-valencian-locale.patch rename to packages/glibc-ports/2.12.1/280-new-valencian-locale.patch diff --git a/packages/glibc/ports-2.12.1/300-nscd-one-fork.patch b/packages/glibc-ports/2.12.1/300-nscd-one-fork.patch similarity index 100% rename from packages/glibc/ports-2.12.1/300-nscd-one-fork.patch rename to packages/glibc-ports/2.12.1/300-nscd-one-fork.patch diff --git a/packages/glibc/ports-2.12.1/310-hppa-nptl-carlos.patch b/packages/glibc-ports/2.12.1/310-hppa-nptl-carlos.patch similarity index 100% rename from packages/glibc/ports-2.12.1/310-hppa-nptl-carlos.patch rename to packages/glibc-ports/2.12.1/310-hppa-nptl-carlos.patch diff --git a/packages/glibc/ports-2.12.1/330-m68k-sys-user.patch b/packages/glibc-ports/2.12.1/330-m68k-sys-user.patch similarity index 100% rename from packages/glibc/ports-2.12.1/330-m68k-sys-user.patch rename to packages/glibc-ports/2.12.1/330-m68k-sys-user.patch diff --git a/packages/glibc/ports-2.12.1/340-dl_execstack-PaX-support.patch b/packages/glibc-ports/2.12.1/340-dl_execstack-PaX-support.patch similarity index 100% rename from packages/glibc/ports-2.12.1/340-dl_execstack-PaX-support.patch rename to packages/glibc-ports/2.12.1/340-dl_execstack-PaX-support.patch diff --git a/packages/glibc/ports-2.12.1/350-pre20040117-pt_pax.patch b/packages/glibc-ports/2.12.1/350-pre20040117-pt_pax.patch similarity index 100% rename from packages/glibc/ports-2.12.1/350-pre20040117-pt_pax.patch rename to packages/glibc-ports/2.12.1/350-pre20040117-pt_pax.patch diff --git a/packages/glibc/ports-2.12.1/360-tests-sandbox-libdl-paths.patch b/packages/glibc-ports/2.12.1/360-tests-sandbox-libdl-paths.patch similarity index 100% rename from packages/glibc/ports-2.12.1/360-tests-sandbox-libdl-paths.patch rename to packages/glibc-ports/2.12.1/360-tests-sandbox-libdl-paths.patch diff --git a/packages/glibc/ports-2.12.1/370-fnmatch.patch b/packages/glibc-ports/2.12.1/370-fnmatch.patch similarity index 100% rename from packages/glibc/ports-2.12.1/370-fnmatch.patch rename to packages/glibc-ports/2.12.1/370-fnmatch.patch diff --git a/packages/glibc/ports-2.12.1/380-dont-build-timezone.patch b/packages/glibc-ports/2.12.1/380-dont-build-timezone.patch similarity index 100% rename from packages/glibc/ports-2.12.1/380-dont-build-timezone.patch rename to packages/glibc-ports/2.12.1/380-dont-build-timezone.patch diff --git a/packages/glibc/ports-2.12.1/400-alpha-xstat.patch b/packages/glibc-ports/2.12.1/400-alpha-xstat.patch similarity index 100% rename from packages/glibc/ports-2.12.1/400-alpha-xstat.patch rename to packages/glibc-ports/2.12.1/400-alpha-xstat.patch diff --git a/packages/glibc/ports-2.12.1/430-alpha-creat.patch b/packages/glibc-ports/2.12.1/430-alpha-creat.patch similarity index 100% rename from packages/glibc/ports-2.12.1/430-alpha-creat.patch rename to packages/glibc-ports/2.12.1/430-alpha-creat.patch diff --git a/packages/glibc/ports-2.12.1/440-alpha-cache-shape.patch b/packages/glibc-ports/2.12.1/440-alpha-cache-shape.patch similarity index 100% rename from packages/glibc/ports-2.12.1/440-alpha-cache-shape.patch rename to packages/glibc-ports/2.12.1/440-alpha-cache-shape.patch diff --git a/packages/glibc/ports-2.12.1/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.12.1/460-alpha-fix-gcc-4.1-warnings.patch similarity index 100% rename from packages/glibc/ports-2.12.1/460-alpha-fix-gcc-4.1-warnings.patch rename to packages/glibc-ports/2.12.1/460-alpha-fix-gcc-4.1-warnings.patch diff --git a/packages/glibc/ports-2.12.1/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc-ports/2.12.1/490-alpha_alpha-add-fdatasync-support.patch similarity index 100% rename from packages/glibc/ports-2.12.1/490-alpha_alpha-add-fdatasync-support.patch rename to packages/glibc-ports/2.12.1/490-alpha_alpha-add-fdatasync-support.patch diff --git a/packages/glibc/ports-2.12.1/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.12.1/530-alpha-fix-rtld-fPIC.patch similarity index 100% rename from packages/glibc/ports-2.12.1/530-alpha-fix-rtld-fPIC.patch rename to packages/glibc-ports/2.12.1/530-alpha-fix-rtld-fPIC.patch diff --git a/packages/glibc/ports-2.12.1/560-ppc-atomic.patch b/packages/glibc-ports/2.12.1/560-ppc-atomic.patch similarity index 100% rename from packages/glibc/ports-2.12.1/560-ppc-atomic.patch rename to packages/glibc-ports/2.12.1/560-ppc-atomic.patch diff --git a/packages/glibc/ports-2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch similarity index 100% rename from packages/glibc/ports-2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch rename to packages/glibc-ports/2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch diff --git a/packages/glibc/ports-2.12.1/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.12.1/580-nptl-lowlevellock.patch similarity index 100% rename from packages/glibc/ports-2.12.1/580-nptl-lowlevellock.patch rename to packages/glibc-ports/2.12.1/580-nptl-lowlevellock.patch diff --git a/packages/glibc/ports-2.12.1/610-fpu-cw-mips.patch b/packages/glibc-ports/2.12.1/610-fpu-cw-mips.patch similarity index 100% rename from packages/glibc/ports-2.12.1/610-fpu-cw-mips.patch rename to packages/glibc-ports/2.12.1/610-fpu-cw-mips.patch diff --git a/packages/glibc/ports-2.12.1/630-mips_shn_undef-hack.patch b/packages/glibc-ports/2.12.1/630-mips_shn_undef-hack.patch similarity index 100% rename from packages/glibc/ports-2.12.1/630-mips_shn_undef-hack.patch rename to packages/glibc-ports/2.12.1/630-mips_shn_undef-hack.patch diff --git a/packages/glibc/ports-2.12.1/640-alpha-atfcts.patch b/packages/glibc-ports/2.12.1/640-alpha-atfcts.patch similarity index 100% rename from packages/glibc/ports-2.12.1/640-alpha-atfcts.patch rename to packages/glibc-ports/2.12.1/640-alpha-atfcts.patch diff --git a/packages/glibc/ports-2.12.1/650-syslog.patch b/packages/glibc-ports/2.12.1/650-syslog.patch similarity index 100% rename from packages/glibc/ports-2.12.1/650-syslog.patch rename to packages/glibc-ports/2.12.1/650-syslog.patch diff --git a/packages/glibc/ports-2.12.1/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc-ports/2.12.1/660-debug-readlink_chk-readklinkat_chk.patch similarity index 100% rename from packages/glibc/ports-2.12.1/660-debug-readlink_chk-readklinkat_chk.patch rename to packages/glibc-ports/2.12.1/660-debug-readlink_chk-readklinkat_chk.patch diff --git a/packages/glibc/ports-2.12.1/670-support-hard-float-eabi.patch b/packages/glibc-ports/2.12.1/670-support-hard-float-eabi.patch similarity index 100% rename from packages/glibc/ports-2.12.1/670-support-hard-float-eabi.patch rename to packages/glibc-ports/2.12.1/670-support-hard-float-eabi.patch diff --git a/packages/glibc-ports/2.12.1/version.desc b/packages/glibc-ports/2.12.1/version.desc new file mode 100644 index 00000000..e69de29b diff --git a/packages/glibc/ports-2.13/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch similarity index 100% rename from packages/glibc/ports-2.13/090-Fix-ARM-build-with-GCC-trunk.patch rename to packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch diff --git a/packages/glibc/ports-2.13/100-respect-env-CPPFLAGS.patch b/packages/glibc-ports/2.13/100-respect-env-CPPFLAGS.patch similarity index 100% rename from packages/glibc/ports-2.13/100-respect-env-CPPFLAGS.patch rename to packages/glibc-ports/2.13/100-respect-env-CPPFLAGS.patch diff --git a/packages/glibc/ports-2.13/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc-ports/2.13/120-i386-x86_64-revert-clone-cfi.patch similarity index 100% rename from packages/glibc/ports-2.13/120-i386-x86_64-revert-clone-cfi.patch rename to packages/glibc-ports/2.13/120-i386-x86_64-revert-clone-cfi.patch diff --git a/packages/glibc/ports-2.13/140-disable-ldconfig.patch b/packages/glibc-ports/2.13/140-disable-ldconfig.patch similarity index 100% rename from packages/glibc/ports-2.13/140-disable-ldconfig.patch rename to packages/glibc-ports/2.13/140-disable-ldconfig.patch diff --git a/packages/glibc/ports-2.13/150-queue-header-updates.patch b/packages/glibc-ports/2.13/150-queue-header-updates.patch similarity index 100% rename from packages/glibc/ports-2.13/150-queue-header-updates.patch rename to packages/glibc-ports/2.13/150-queue-header-updates.patch diff --git a/packages/glibc/ports-2.13/160-manual-no-perl.patch b/packages/glibc-ports/2.13/160-manual-no-perl.patch similarity index 100% rename from packages/glibc/ports-2.13/160-manual-no-perl.patch rename to packages/glibc-ports/2.13/160-manual-no-perl.patch diff --git a/packages/glibc/ports-2.13/170-localedef-fix-trampoline.patch b/packages/glibc-ports/2.13/170-localedef-fix-trampoline.patch similarity index 100% rename from packages/glibc/ports-2.13/170-localedef-fix-trampoline.patch rename to packages/glibc-ports/2.13/170-localedef-fix-trampoline.patch diff --git a/packages/glibc/ports-2.13/180-resolv-dynamic.patch b/packages/glibc-ports/2.13/180-resolv-dynamic.patch similarity index 100% rename from packages/glibc/ports-2.13/180-resolv-dynamic.patch rename to packages/glibc-ports/2.13/180-resolv-dynamic.patch diff --git a/packages/glibc/ports-2.13/190-localedef-mmap.patch b/packages/glibc-ports/2.13/190-localedef-mmap.patch similarity index 100% rename from packages/glibc/ports-2.13/190-localedef-mmap.patch rename to packages/glibc-ports/2.13/190-localedef-mmap.patch diff --git a/packages/glibc/ports-2.13/200-fadvise64_64.patch b/packages/glibc-ports/2.13/200-fadvise64_64.patch similarity index 100% rename from packages/glibc/ports-2.13/200-fadvise64_64.patch rename to packages/glibc-ports/2.13/200-fadvise64_64.patch diff --git a/packages/glibc/ports-2.13/220-section-comments.patch b/packages/glibc-ports/2.13/220-section-comments.patch similarity index 100% rename from packages/glibc/ports-2.13/220-section-comments.patch rename to packages/glibc-ports/2.13/220-section-comments.patch diff --git a/packages/glibc/ports-2.13/230-no-inline-gmon.patch b/packages/glibc-ports/2.13/230-no-inline-gmon.patch similarity index 100% rename from packages/glibc/ports-2.13/230-no-inline-gmon.patch rename to packages/glibc-ports/2.13/230-no-inline-gmon.patch diff --git a/packages/glibc/ports-2.13/240-check_native-headers.patch b/packages/glibc-ports/2.13/240-check_native-headers.patch similarity index 100% rename from packages/glibc/ports-2.13/240-check_native-headers.patch rename to packages/glibc-ports/2.13/240-check_native-headers.patch diff --git a/packages/glibc/ports-2.13/250-fix-pr631.patch b/packages/glibc-ports/2.13/250-fix-pr631.patch similarity index 100% rename from packages/glibc/ports-2.13/250-fix-pr631.patch rename to packages/glibc-ports/2.13/250-fix-pr631.patch diff --git a/packages/glibc/ports-2.13/260-assume-pipe2.patch b/packages/glibc-ports/2.13/260-assume-pipe2.patch similarity index 100% rename from packages/glibc/ports-2.13/260-assume-pipe2.patch rename to packages/glibc-ports/2.13/260-assume-pipe2.patch diff --git a/packages/glibc/ports-2.13/270-china.patch b/packages/glibc-ports/2.13/270-china.patch similarity index 100% rename from packages/glibc/ports-2.13/270-china.patch rename to packages/glibc-ports/2.13/270-china.patch diff --git a/packages/glibc/ports-2.13/280-new-valencian-locale.patch b/packages/glibc-ports/2.13/280-new-valencian-locale.patch similarity index 100% rename from packages/glibc/ports-2.13/280-new-valencian-locale.patch rename to packages/glibc-ports/2.13/280-new-valencian-locale.patch diff --git a/packages/glibc/ports-2.13/300-nscd-one-fork.patch b/packages/glibc-ports/2.13/300-nscd-one-fork.patch similarity index 100% rename from packages/glibc/ports-2.13/300-nscd-one-fork.patch rename to packages/glibc-ports/2.13/300-nscd-one-fork.patch diff --git a/packages/glibc/ports-2.13/310-hppa-nptl-carlos.patch b/packages/glibc-ports/2.13/310-hppa-nptl-carlos.patch similarity index 100% rename from packages/glibc/ports-2.13/310-hppa-nptl-carlos.patch rename to packages/glibc-ports/2.13/310-hppa-nptl-carlos.patch diff --git a/packages/glibc/ports-2.13/330-m68k-sys-user.patch b/packages/glibc-ports/2.13/330-m68k-sys-user.patch similarity index 100% rename from packages/glibc/ports-2.13/330-m68k-sys-user.patch rename to packages/glibc-ports/2.13/330-m68k-sys-user.patch diff --git a/packages/glibc/ports-2.13/340-dl_execstack-PaX-support.patch b/packages/glibc-ports/2.13/340-dl_execstack-PaX-support.patch similarity index 100% rename from packages/glibc/ports-2.13/340-dl_execstack-PaX-support.patch rename to packages/glibc-ports/2.13/340-dl_execstack-PaX-support.patch diff --git a/packages/glibc/ports-2.13/350-pre20040117-pt_pax.patch b/packages/glibc-ports/2.13/350-pre20040117-pt_pax.patch similarity index 100% rename from packages/glibc/ports-2.13/350-pre20040117-pt_pax.patch rename to packages/glibc-ports/2.13/350-pre20040117-pt_pax.patch diff --git a/packages/glibc/ports-2.13/360-tests-sandbox-libdl-paths.patch b/packages/glibc-ports/2.13/360-tests-sandbox-libdl-paths.patch similarity index 100% rename from packages/glibc/ports-2.13/360-tests-sandbox-libdl-paths.patch rename to packages/glibc-ports/2.13/360-tests-sandbox-libdl-paths.patch diff --git a/packages/glibc/ports-2.13/380-dont-build-timezone.patch b/packages/glibc-ports/2.13/380-dont-build-timezone.patch similarity index 100% rename from packages/glibc/ports-2.13/380-dont-build-timezone.patch rename to packages/glibc-ports/2.13/380-dont-build-timezone.patch diff --git a/packages/glibc/ports-2.13/400-alpha-xstat.patch b/packages/glibc-ports/2.13/400-alpha-xstat.patch similarity index 100% rename from packages/glibc/ports-2.13/400-alpha-xstat.patch rename to packages/glibc-ports/2.13/400-alpha-xstat.patch diff --git a/packages/glibc/ports-2.13/410-alpha-SETPIPE-GETPIPE.patch b/packages/glibc-ports/2.13/410-alpha-SETPIPE-GETPIPE.patch similarity index 100% rename from packages/glibc/ports-2.13/410-alpha-SETPIPE-GETPIPE.patch rename to packages/glibc-ports/2.13/410-alpha-SETPIPE-GETPIPE.patch diff --git a/packages/glibc/ports-2.13/420-alpha-statfs.patch b/packages/glibc-ports/2.13/420-alpha-statfs.patch similarity index 100% rename from packages/glibc/ports-2.13/420-alpha-statfs.patch rename to packages/glibc-ports/2.13/420-alpha-statfs.patch diff --git a/packages/glibc/ports-2.13/430-alpha-creat.patch b/packages/glibc-ports/2.13/430-alpha-creat.patch similarity index 100% rename from packages/glibc/ports-2.13/430-alpha-creat.patch rename to packages/glibc-ports/2.13/430-alpha-creat.patch diff --git a/packages/glibc/ports-2.13/440-alpha-cache-shape.patch b/packages/glibc-ports/2.13/440-alpha-cache-shape.patch similarity index 100% rename from packages/glibc/ports-2.13/440-alpha-cache-shape.patch rename to packages/glibc-ports/2.13/440-alpha-cache-shape.patch diff --git a/packages/glibc/ports-2.13/450-alpha-DEFAULT_STACK_PERMS.patch b/packages/glibc-ports/2.13/450-alpha-DEFAULT_STACK_PERMS.patch similarity index 100% rename from packages/glibc/ports-2.13/450-alpha-DEFAULT_STACK_PERMS.patch rename to packages/glibc-ports/2.13/450-alpha-DEFAULT_STACK_PERMS.patch diff --git a/packages/glibc/ports-2.13/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch similarity index 100% rename from packages/glibc/ports-2.13/460-alpha-fix-gcc-4.1-warnings.patch rename to packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch diff --git a/packages/glibc/ports-2.13/470-alpha-feupdateenv.patch b/packages/glibc-ports/2.13/470-alpha-feupdateenv.patch similarity index 100% rename from packages/glibc/ports-2.13/470-alpha-feupdateenv.patch rename to packages/glibc-ports/2.13/470-alpha-feupdateenv.patch diff --git a/packages/glibc/ports-2.13/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc-ports/2.13/490-alpha_alpha-add-fdatasync-support.patch similarity index 100% rename from packages/glibc/ports-2.13/490-alpha_alpha-add-fdatasync-support.patch rename to packages/glibc-ports/2.13/490-alpha_alpha-add-fdatasync-support.patch diff --git a/packages/glibc/ports-2.13/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch similarity index 100% rename from packages/glibc/ports-2.13/530-alpha-fix-rtld-fPIC.patch rename to packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch diff --git a/packages/glibc/ports-2.13/560-ppc-atomic.patch b/packages/glibc-ports/2.13/560-ppc-atomic.patch similarity index 100% rename from packages/glibc/ports-2.13/560-ppc-atomic.patch rename to packages/glibc-ports/2.13/560-ppc-atomic.patch diff --git a/packages/glibc/ports-2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch similarity index 100% rename from packages/glibc/ports-2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch rename to packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch diff --git a/packages/glibc/ports-2.13/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.13/580-nptl-lowlevellock.patch similarity index 100% rename from packages/glibc/ports-2.13/580-nptl-lowlevellock.patch rename to packages/glibc-ports/2.13/580-nptl-lowlevellock.patch diff --git a/packages/glibc/ports-2.13/610-fpu-cw-mips.patch b/packages/glibc-ports/2.13/610-fpu-cw-mips.patch similarity index 100% rename from packages/glibc/ports-2.13/610-fpu-cw-mips.patch rename to packages/glibc-ports/2.13/610-fpu-cw-mips.patch diff --git a/packages/glibc/ports-2.13/630-mips_shn_undef-hack.patch b/packages/glibc-ports/2.13/630-mips_shn_undef-hack.patch similarity index 100% rename from packages/glibc/ports-2.13/630-mips_shn_undef-hack.patch rename to packages/glibc-ports/2.13/630-mips_shn_undef-hack.patch diff --git a/packages/glibc/ports-2.13/640-alpha-atfcts.patch b/packages/glibc-ports/2.13/640-alpha-atfcts.patch similarity index 100% rename from packages/glibc/ports-2.13/640-alpha-atfcts.patch rename to packages/glibc-ports/2.13/640-alpha-atfcts.patch diff --git a/packages/glibc/ports-2.13/650-syslog.patch b/packages/glibc-ports/2.13/650-syslog.patch similarity index 100% rename from packages/glibc/ports-2.13/650-syslog.patch rename to packages/glibc-ports/2.13/650-syslog.patch diff --git a/packages/glibc/ports-2.13/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc-ports/2.13/660-debug-readlink_chk-readklinkat_chk.patch similarity index 100% rename from packages/glibc/ports-2.13/660-debug-readlink_chk-readklinkat_chk.patch rename to packages/glibc-ports/2.13/660-debug-readlink_chk-readklinkat_chk.patch diff --git a/packages/glibc/ports-2.13/670-support-hard-float-eabi.patch b/packages/glibc-ports/2.13/670-support-hard-float-eabi.patch similarity index 100% rename from packages/glibc/ports-2.13/670-support-hard-float-eabi.patch rename to packages/glibc-ports/2.13/670-support-hard-float-eabi.patch diff --git a/packages/glibc-ports/2.13/version.desc b/packages/glibc-ports/2.13/version.desc new file mode 100644 index 00000000..e69de29b diff --git a/packages/glibc/ports-2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch similarity index 100% rename from packages/glibc/ports-2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch rename to packages/glibc-ports/2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch diff --git a/packages/glibc/ports-2.14.1/100-respect-env-CPPFLAGS.patch b/packages/glibc-ports/2.14.1/100-respect-env-CPPFLAGS.patch similarity index 100% rename from packages/glibc/ports-2.14.1/100-respect-env-CPPFLAGS.patch rename to packages/glibc-ports/2.14.1/100-respect-env-CPPFLAGS.patch diff --git a/packages/glibc/ports-2.14.1/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc-ports/2.14.1/120-i386-x86_64-revert-clone-cfi.patch similarity index 100% rename from packages/glibc/ports-2.14.1/120-i386-x86_64-revert-clone-cfi.patch rename to packages/glibc-ports/2.14.1/120-i386-x86_64-revert-clone-cfi.patch diff --git a/packages/glibc/ports-2.14.1/140-disable-ldconfig.patch b/packages/glibc-ports/2.14.1/140-disable-ldconfig.patch similarity index 100% rename from packages/glibc/ports-2.14.1/140-disable-ldconfig.patch rename to packages/glibc-ports/2.14.1/140-disable-ldconfig.patch diff --git a/packages/glibc/ports-2.14.1/150-queue-header-updates.patch b/packages/glibc-ports/2.14.1/150-queue-header-updates.patch similarity index 100% rename from packages/glibc/ports-2.14.1/150-queue-header-updates.patch rename to packages/glibc-ports/2.14.1/150-queue-header-updates.patch diff --git a/packages/glibc/ports-2.14.1/160-manual-no-perl.patch b/packages/glibc-ports/2.14.1/160-manual-no-perl.patch similarity index 100% rename from packages/glibc/ports-2.14.1/160-manual-no-perl.patch rename to packages/glibc-ports/2.14.1/160-manual-no-perl.patch diff --git a/packages/glibc/ports-2.14.1/170-localedef-fix-trampoline.patch b/packages/glibc-ports/2.14.1/170-localedef-fix-trampoline.patch similarity index 100% rename from packages/glibc/ports-2.14.1/170-localedef-fix-trampoline.patch rename to packages/glibc-ports/2.14.1/170-localedef-fix-trampoline.patch diff --git a/packages/glibc/ports-2.14.1/180-resolv-dynamic.patch b/packages/glibc-ports/2.14.1/180-resolv-dynamic.patch similarity index 100% rename from packages/glibc/ports-2.14.1/180-resolv-dynamic.patch rename to packages/glibc-ports/2.14.1/180-resolv-dynamic.patch diff --git a/packages/glibc/ports-2.14.1/190-localedef-mmap.patch b/packages/glibc-ports/2.14.1/190-localedef-mmap.patch similarity index 100% rename from packages/glibc/ports-2.14.1/190-localedef-mmap.patch rename to packages/glibc-ports/2.14.1/190-localedef-mmap.patch diff --git a/packages/glibc/ports-2.14.1/200-fadvise64_64.patch b/packages/glibc-ports/2.14.1/200-fadvise64_64.patch similarity index 100% rename from packages/glibc/ports-2.14.1/200-fadvise64_64.patch rename to packages/glibc-ports/2.14.1/200-fadvise64_64.patch diff --git a/packages/glibc/ports-2.14.1/220-section-comments.patch b/packages/glibc-ports/2.14.1/220-section-comments.patch similarity index 100% rename from packages/glibc/ports-2.14.1/220-section-comments.patch rename to packages/glibc-ports/2.14.1/220-section-comments.patch diff --git a/packages/glibc/ports-2.14.1/230-no-inline-gmon.patch b/packages/glibc-ports/2.14.1/230-no-inline-gmon.patch similarity index 100% rename from packages/glibc/ports-2.14.1/230-no-inline-gmon.patch rename to packages/glibc-ports/2.14.1/230-no-inline-gmon.patch diff --git a/packages/glibc/ports-2.14.1/260-assume-pipe2.patch b/packages/glibc-ports/2.14.1/260-assume-pipe2.patch similarity index 100% rename from packages/glibc/ports-2.14.1/260-assume-pipe2.patch rename to packages/glibc-ports/2.14.1/260-assume-pipe2.patch diff --git a/packages/glibc/ports-2.14.1/270-china.patch b/packages/glibc-ports/2.14.1/270-china.patch similarity index 100% rename from packages/glibc/ports-2.14.1/270-china.patch rename to packages/glibc-ports/2.14.1/270-china.patch diff --git a/packages/glibc/ports-2.14.1/280-new-valencian-locale.patch b/packages/glibc-ports/2.14.1/280-new-valencian-locale.patch similarity index 100% rename from packages/glibc/ports-2.14.1/280-new-valencian-locale.patch rename to packages/glibc-ports/2.14.1/280-new-valencian-locale.patch diff --git a/packages/glibc/ports-2.14.1/300-nscd-one-fork.patch b/packages/glibc-ports/2.14.1/300-nscd-one-fork.patch similarity index 100% rename from packages/glibc/ports-2.14.1/300-nscd-one-fork.patch rename to packages/glibc-ports/2.14.1/300-nscd-one-fork.patch diff --git a/packages/glibc/ports-2.14.1/310-hppa-nptl-carlos.patch b/packages/glibc-ports/2.14.1/310-hppa-nptl-carlos.patch similarity index 100% rename from packages/glibc/ports-2.14.1/310-hppa-nptl-carlos.patch rename to packages/glibc-ports/2.14.1/310-hppa-nptl-carlos.patch diff --git a/packages/glibc/ports-2.14.1/330-m68k-sys-user.patch b/packages/glibc-ports/2.14.1/330-m68k-sys-user.patch similarity index 100% rename from packages/glibc/ports-2.14.1/330-m68k-sys-user.patch rename to packages/glibc-ports/2.14.1/330-m68k-sys-user.patch diff --git a/packages/glibc/ports-2.14.1/340-dl_execstack-PaX-support.patch b/packages/glibc-ports/2.14.1/340-dl_execstack-PaX-support.patch similarity index 100% rename from packages/glibc/ports-2.14.1/340-dl_execstack-PaX-support.patch rename to packages/glibc-ports/2.14.1/340-dl_execstack-PaX-support.patch diff --git a/packages/glibc/ports-2.14.1/350-pre20040117-pt_pax.patch b/packages/glibc-ports/2.14.1/350-pre20040117-pt_pax.patch similarity index 100% rename from packages/glibc/ports-2.14.1/350-pre20040117-pt_pax.patch rename to packages/glibc-ports/2.14.1/350-pre20040117-pt_pax.patch diff --git a/packages/glibc/ports-2.14.1/360-tests-sandbox-libdl-paths.patch b/packages/glibc-ports/2.14.1/360-tests-sandbox-libdl-paths.patch similarity index 100% rename from packages/glibc/ports-2.14.1/360-tests-sandbox-libdl-paths.patch rename to packages/glibc-ports/2.14.1/360-tests-sandbox-libdl-paths.patch diff --git a/packages/glibc/ports-2.14.1/380-dont-build-timezone.patch b/packages/glibc-ports/2.14.1/380-dont-build-timezone.patch similarity index 100% rename from packages/glibc/ports-2.14.1/380-dont-build-timezone.patch rename to packages/glibc-ports/2.14.1/380-dont-build-timezone.patch diff --git a/packages/glibc/ports-2.14.1/400-alpha-xstat.patch b/packages/glibc-ports/2.14.1/400-alpha-xstat.patch similarity index 100% rename from packages/glibc/ports-2.14.1/400-alpha-xstat.patch rename to packages/glibc-ports/2.14.1/400-alpha-xstat.patch diff --git a/packages/glibc/ports-2.14.1/430-alpha-creat.patch b/packages/glibc-ports/2.14.1/430-alpha-creat.patch similarity index 100% rename from packages/glibc/ports-2.14.1/430-alpha-creat.patch rename to packages/glibc-ports/2.14.1/430-alpha-creat.patch diff --git a/packages/glibc/ports-2.14.1/440-alpha-cache-shape.patch b/packages/glibc-ports/2.14.1/440-alpha-cache-shape.patch similarity index 100% rename from packages/glibc/ports-2.14.1/440-alpha-cache-shape.patch rename to packages/glibc-ports/2.14.1/440-alpha-cache-shape.patch diff --git a/packages/glibc/ports-2.14.1/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.14.1/460-alpha-fix-gcc-4.1-warnings.patch similarity index 100% rename from packages/glibc/ports-2.14.1/460-alpha-fix-gcc-4.1-warnings.patch rename to packages/glibc-ports/2.14.1/460-alpha-fix-gcc-4.1-warnings.patch diff --git a/packages/glibc/ports-2.14.1/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc-ports/2.14.1/490-alpha_alpha-add-fdatasync-support.patch similarity index 100% rename from packages/glibc/ports-2.14.1/490-alpha_alpha-add-fdatasync-support.patch rename to packages/glibc-ports/2.14.1/490-alpha_alpha-add-fdatasync-support.patch diff --git a/packages/glibc/ports-2.14.1/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.14.1/530-alpha-fix-rtld-fPIC.patch similarity index 100% rename from packages/glibc/ports-2.14.1/530-alpha-fix-rtld-fPIC.patch rename to packages/glibc-ports/2.14.1/530-alpha-fix-rtld-fPIC.patch diff --git a/packages/glibc/ports-2.14.1/560-ppc-atomic.patch b/packages/glibc-ports/2.14.1/560-ppc-atomic.patch similarity index 100% rename from packages/glibc/ports-2.14.1/560-ppc-atomic.patch rename to packages/glibc-ports/2.14.1/560-ppc-atomic.patch diff --git a/packages/glibc/ports-2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch similarity index 100% rename from packages/glibc/ports-2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch rename to packages/glibc-ports/2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch diff --git a/packages/glibc/ports-2.14.1/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.14.1/580-nptl-lowlevellock.patch similarity index 100% rename from packages/glibc/ports-2.14.1/580-nptl-lowlevellock.patch rename to packages/glibc-ports/2.14.1/580-nptl-lowlevellock.patch diff --git a/packages/glibc/ports-2.14.1/610-fpu-cw-mips.patch b/packages/glibc-ports/2.14.1/610-fpu-cw-mips.patch similarity index 100% rename from packages/glibc/ports-2.14.1/610-fpu-cw-mips.patch rename to packages/glibc-ports/2.14.1/610-fpu-cw-mips.patch diff --git a/packages/glibc/ports-2.14.1/630-mips_shn_undef-hack.patch b/packages/glibc-ports/2.14.1/630-mips_shn_undef-hack.patch similarity index 100% rename from packages/glibc/ports-2.14.1/630-mips_shn_undef-hack.patch rename to packages/glibc-ports/2.14.1/630-mips_shn_undef-hack.patch diff --git a/packages/glibc/ports-2.14.1/640-alpha-atfcts.patch b/packages/glibc-ports/2.14.1/640-alpha-atfcts.patch similarity index 100% rename from packages/glibc/ports-2.14.1/640-alpha-atfcts.patch rename to packages/glibc-ports/2.14.1/640-alpha-atfcts.patch diff --git a/packages/glibc/ports-2.14.1/650-syslog.patch b/packages/glibc-ports/2.14.1/650-syslog.patch similarity index 100% rename from packages/glibc/ports-2.14.1/650-syslog.patch rename to packages/glibc-ports/2.14.1/650-syslog.patch diff --git a/packages/glibc/ports-2.14.1/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc-ports/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch similarity index 100% rename from packages/glibc/ports-2.14.1/660-debug-readlink_chk-readklinkat_chk.patch rename to packages/glibc-ports/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch diff --git a/packages/glibc-ports/2.14.1/version.desc b/packages/glibc-ports/2.14.1/version.desc new file mode 100644 index 00000000..e69de29b diff --git a/packages/glibc/ports-2.14/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.14/090-Fix-ARM-build-with-GCC-trunk.patch similarity index 100% rename from packages/glibc/ports-2.14/090-Fix-ARM-build-with-GCC-trunk.patch rename to packages/glibc-ports/2.14/090-Fix-ARM-build-with-GCC-trunk.patch diff --git a/packages/glibc/ports-2.14/100-respect-env-CPPFLAGS.patch b/packages/glibc-ports/2.14/100-respect-env-CPPFLAGS.patch similarity index 100% rename from packages/glibc/ports-2.14/100-respect-env-CPPFLAGS.patch rename to packages/glibc-ports/2.14/100-respect-env-CPPFLAGS.patch diff --git a/packages/glibc/ports-2.14/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc-ports/2.14/120-i386-x86_64-revert-clone-cfi.patch similarity index 100% rename from packages/glibc/ports-2.14/120-i386-x86_64-revert-clone-cfi.patch rename to packages/glibc-ports/2.14/120-i386-x86_64-revert-clone-cfi.patch diff --git a/packages/glibc/ports-2.14/140-disable-ldconfig.patch b/packages/glibc-ports/2.14/140-disable-ldconfig.patch similarity index 100% rename from packages/glibc/ports-2.14/140-disable-ldconfig.patch rename to packages/glibc-ports/2.14/140-disable-ldconfig.patch diff --git a/packages/glibc/ports-2.14/150-queue-header-updates.patch b/packages/glibc-ports/2.14/150-queue-header-updates.patch similarity index 100% rename from packages/glibc/ports-2.14/150-queue-header-updates.patch rename to packages/glibc-ports/2.14/150-queue-header-updates.patch diff --git a/packages/glibc/ports-2.14/160-manual-no-perl.patch b/packages/glibc-ports/2.14/160-manual-no-perl.patch similarity index 100% rename from packages/glibc/ports-2.14/160-manual-no-perl.patch rename to packages/glibc-ports/2.14/160-manual-no-perl.patch diff --git a/packages/glibc/ports-2.14/170-localedef-fix-trampoline.patch b/packages/glibc-ports/2.14/170-localedef-fix-trampoline.patch similarity index 100% rename from packages/glibc/ports-2.14/170-localedef-fix-trampoline.patch rename to packages/glibc-ports/2.14/170-localedef-fix-trampoline.patch diff --git a/packages/glibc/ports-2.14/180-resolv-dynamic.patch b/packages/glibc-ports/2.14/180-resolv-dynamic.patch similarity index 100% rename from packages/glibc/ports-2.14/180-resolv-dynamic.patch rename to packages/glibc-ports/2.14/180-resolv-dynamic.patch diff --git a/packages/glibc/ports-2.14/190-localedef-mmap.patch b/packages/glibc-ports/2.14/190-localedef-mmap.patch similarity index 100% rename from packages/glibc/ports-2.14/190-localedef-mmap.patch rename to packages/glibc-ports/2.14/190-localedef-mmap.patch diff --git a/packages/glibc/ports-2.14/200-fadvise64_64.patch b/packages/glibc-ports/2.14/200-fadvise64_64.patch similarity index 100% rename from packages/glibc/ports-2.14/200-fadvise64_64.patch rename to packages/glibc-ports/2.14/200-fadvise64_64.patch diff --git a/packages/glibc/ports-2.14/220-section-comments.patch b/packages/glibc-ports/2.14/220-section-comments.patch similarity index 100% rename from packages/glibc/ports-2.14/220-section-comments.patch rename to packages/glibc-ports/2.14/220-section-comments.patch diff --git a/packages/glibc/ports-2.14/230-no-inline-gmon.patch b/packages/glibc-ports/2.14/230-no-inline-gmon.patch similarity index 100% rename from packages/glibc/ports-2.14/230-no-inline-gmon.patch rename to packages/glibc-ports/2.14/230-no-inline-gmon.patch diff --git a/packages/glibc/ports-2.14/240-check_native-headers.patch b/packages/glibc-ports/2.14/240-check_native-headers.patch similarity index 100% rename from packages/glibc/ports-2.14/240-check_native-headers.patch rename to packages/glibc-ports/2.14/240-check_native-headers.patch diff --git a/packages/glibc/ports-2.14/260-assume-pipe2.patch b/packages/glibc-ports/2.14/260-assume-pipe2.patch similarity index 100% rename from packages/glibc/ports-2.14/260-assume-pipe2.patch rename to packages/glibc-ports/2.14/260-assume-pipe2.patch diff --git a/packages/glibc/ports-2.14/270-china.patch b/packages/glibc-ports/2.14/270-china.patch similarity index 100% rename from packages/glibc/ports-2.14/270-china.patch rename to packages/glibc-ports/2.14/270-china.patch diff --git a/packages/glibc/ports-2.14/280-new-valencian-locale.patch b/packages/glibc-ports/2.14/280-new-valencian-locale.patch similarity index 100% rename from packages/glibc/ports-2.14/280-new-valencian-locale.patch rename to packages/glibc-ports/2.14/280-new-valencian-locale.patch diff --git a/packages/glibc/ports-2.14/300-nscd-one-fork.patch b/packages/glibc-ports/2.14/300-nscd-one-fork.patch similarity index 100% rename from packages/glibc/ports-2.14/300-nscd-one-fork.patch rename to packages/glibc-ports/2.14/300-nscd-one-fork.patch diff --git a/packages/glibc/ports-2.14/310-hppa-nptl-carlos.patch b/packages/glibc-ports/2.14/310-hppa-nptl-carlos.patch similarity index 100% rename from packages/glibc/ports-2.14/310-hppa-nptl-carlos.patch rename to packages/glibc-ports/2.14/310-hppa-nptl-carlos.patch diff --git a/packages/glibc/ports-2.14/330-m68k-sys-user.patch b/packages/glibc-ports/2.14/330-m68k-sys-user.patch similarity index 100% rename from packages/glibc/ports-2.14/330-m68k-sys-user.patch rename to packages/glibc-ports/2.14/330-m68k-sys-user.patch diff --git a/packages/glibc/ports-2.14/340-dl_execstack-PaX-support.patch b/packages/glibc-ports/2.14/340-dl_execstack-PaX-support.patch similarity index 100% rename from packages/glibc/ports-2.14/340-dl_execstack-PaX-support.patch rename to packages/glibc-ports/2.14/340-dl_execstack-PaX-support.patch diff --git a/packages/glibc/ports-2.14/350-pre20040117-pt_pax.patch b/packages/glibc-ports/2.14/350-pre20040117-pt_pax.patch similarity index 100% rename from packages/glibc/ports-2.14/350-pre20040117-pt_pax.patch rename to packages/glibc-ports/2.14/350-pre20040117-pt_pax.patch diff --git a/packages/glibc/ports-2.14/360-tests-sandbox-libdl-paths.patch b/packages/glibc-ports/2.14/360-tests-sandbox-libdl-paths.patch similarity index 100% rename from packages/glibc/ports-2.14/360-tests-sandbox-libdl-paths.patch rename to packages/glibc-ports/2.14/360-tests-sandbox-libdl-paths.patch diff --git a/packages/glibc/ports-2.14/380-dont-build-timezone.patch b/packages/glibc-ports/2.14/380-dont-build-timezone.patch similarity index 100% rename from packages/glibc/ports-2.14/380-dont-build-timezone.patch rename to packages/glibc-ports/2.14/380-dont-build-timezone.patch diff --git a/packages/glibc/ports-2.14/400-alpha-xstat.patch b/packages/glibc-ports/2.14/400-alpha-xstat.patch similarity index 100% rename from packages/glibc/ports-2.14/400-alpha-xstat.patch rename to packages/glibc-ports/2.14/400-alpha-xstat.patch diff --git a/packages/glibc/ports-2.14/430-alpha-creat.patch b/packages/glibc-ports/2.14/430-alpha-creat.patch similarity index 100% rename from packages/glibc/ports-2.14/430-alpha-creat.patch rename to packages/glibc-ports/2.14/430-alpha-creat.patch diff --git a/packages/glibc/ports-2.14/440-alpha-cache-shape.patch b/packages/glibc-ports/2.14/440-alpha-cache-shape.patch similarity index 100% rename from packages/glibc/ports-2.14/440-alpha-cache-shape.patch rename to packages/glibc-ports/2.14/440-alpha-cache-shape.patch diff --git a/packages/glibc/ports-2.14/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.14/460-alpha-fix-gcc-4.1-warnings.patch similarity index 100% rename from packages/glibc/ports-2.14/460-alpha-fix-gcc-4.1-warnings.patch rename to packages/glibc-ports/2.14/460-alpha-fix-gcc-4.1-warnings.patch diff --git a/packages/glibc/ports-2.14/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc-ports/2.14/490-alpha_alpha-add-fdatasync-support.patch similarity index 100% rename from packages/glibc/ports-2.14/490-alpha_alpha-add-fdatasync-support.patch rename to packages/glibc-ports/2.14/490-alpha_alpha-add-fdatasync-support.patch diff --git a/packages/glibc/ports-2.14/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.14/530-alpha-fix-rtld-fPIC.patch similarity index 100% rename from packages/glibc/ports-2.14/530-alpha-fix-rtld-fPIC.patch rename to packages/glibc-ports/2.14/530-alpha-fix-rtld-fPIC.patch diff --git a/packages/glibc/ports-2.14/560-ppc-atomic.patch b/packages/glibc-ports/2.14/560-ppc-atomic.patch similarity index 100% rename from packages/glibc/ports-2.14/560-ppc-atomic.patch rename to packages/glibc-ports/2.14/560-ppc-atomic.patch diff --git a/packages/glibc/ports-2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch similarity index 100% rename from packages/glibc/ports-2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch rename to packages/glibc-ports/2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch diff --git a/packages/glibc/ports-2.14/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.14/580-nptl-lowlevellock.patch similarity index 100% rename from packages/glibc/ports-2.14/580-nptl-lowlevellock.patch rename to packages/glibc-ports/2.14/580-nptl-lowlevellock.patch diff --git a/packages/glibc/ports-2.14/610-fpu-cw-mips.patch b/packages/glibc-ports/2.14/610-fpu-cw-mips.patch similarity index 100% rename from packages/glibc/ports-2.14/610-fpu-cw-mips.patch rename to packages/glibc-ports/2.14/610-fpu-cw-mips.patch diff --git a/packages/glibc/ports-2.14/630-mips_shn_undef-hack.patch b/packages/glibc-ports/2.14/630-mips_shn_undef-hack.patch similarity index 100% rename from packages/glibc/ports-2.14/630-mips_shn_undef-hack.patch rename to packages/glibc-ports/2.14/630-mips_shn_undef-hack.patch diff --git a/packages/glibc/ports-2.14/640-alpha-atfcts.patch b/packages/glibc-ports/2.14/640-alpha-atfcts.patch similarity index 100% rename from packages/glibc/ports-2.14/640-alpha-atfcts.patch rename to packages/glibc-ports/2.14/640-alpha-atfcts.patch diff --git a/packages/glibc/ports-2.14/650-syslog.patch b/packages/glibc-ports/2.14/650-syslog.patch similarity index 100% rename from packages/glibc/ports-2.14/650-syslog.patch rename to packages/glibc-ports/2.14/650-syslog.patch diff --git a/packages/glibc/ports-2.14/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc-ports/2.14/660-debug-readlink_chk-readklinkat_chk.patch similarity index 100% rename from packages/glibc/ports-2.14/660-debug-readlink_chk-readklinkat_chk.patch rename to packages/glibc-ports/2.14/660-debug-readlink_chk-readklinkat_chk.patch diff --git a/packages/glibc-ports/2.14/version.desc b/packages/glibc-ports/2.14/version.desc new file mode 100644 index 00000000..e69de29b diff --git a/packages/glibc/ports-2.15/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.15/090-Fix-ARM-build-with-GCC-trunk.patch similarity index 100% rename from packages/glibc/ports-2.15/090-Fix-ARM-build-with-GCC-trunk.patch rename to packages/glibc-ports/2.15/090-Fix-ARM-build-with-GCC-trunk.patch diff --git a/packages/glibc/ports-2.15/091-libmemusage-link-failure.patch b/packages/glibc-ports/2.15/091-libmemusage-link-failure.patch similarity index 100% rename from packages/glibc/ports-2.15/091-libmemusage-link-failure.patch rename to packages/glibc-ports/2.15/091-libmemusage-link-failure.patch diff --git a/packages/glibc/ports-2.15/100-respect-env-CPPFLAGS.patch b/packages/glibc-ports/2.15/100-respect-env-CPPFLAGS.patch similarity index 100% rename from packages/glibc/ports-2.15/100-respect-env-CPPFLAGS.patch rename to packages/glibc-ports/2.15/100-respect-env-CPPFLAGS.patch diff --git a/packages/glibc/ports-2.15/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc-ports/2.15/120-i386-x86_64-revert-clone-cfi.patch similarity index 100% rename from packages/glibc/ports-2.15/120-i386-x86_64-revert-clone-cfi.patch rename to packages/glibc-ports/2.15/120-i386-x86_64-revert-clone-cfi.patch diff --git a/packages/glibc/ports-2.15/140-disable-ldconfig.patch b/packages/glibc-ports/2.15/140-disable-ldconfig.patch similarity index 100% rename from packages/glibc/ports-2.15/140-disable-ldconfig.patch rename to packages/glibc-ports/2.15/140-disable-ldconfig.patch diff --git a/packages/glibc/ports-2.15/150-queue-header-updates.patch b/packages/glibc-ports/2.15/150-queue-header-updates.patch similarity index 100% rename from packages/glibc/ports-2.15/150-queue-header-updates.patch rename to packages/glibc-ports/2.15/150-queue-header-updates.patch diff --git a/packages/glibc/ports-2.15/160-manual-no-perl.patch b/packages/glibc-ports/2.15/160-manual-no-perl.patch similarity index 100% rename from packages/glibc/ports-2.15/160-manual-no-perl.patch rename to packages/glibc-ports/2.15/160-manual-no-perl.patch diff --git a/packages/glibc/ports-2.15/170-localedef-fix-trampoline.patch b/packages/glibc-ports/2.15/170-localedef-fix-trampoline.patch similarity index 100% rename from packages/glibc/ports-2.15/170-localedef-fix-trampoline.patch rename to packages/glibc-ports/2.15/170-localedef-fix-trampoline.patch diff --git a/packages/glibc/ports-2.15/180-resolv-dynamic.patch b/packages/glibc-ports/2.15/180-resolv-dynamic.patch similarity index 100% rename from packages/glibc/ports-2.15/180-resolv-dynamic.patch rename to packages/glibc-ports/2.15/180-resolv-dynamic.patch diff --git a/packages/glibc/ports-2.15/200-fadvise64_64.patch b/packages/glibc-ports/2.15/200-fadvise64_64.patch similarity index 100% rename from packages/glibc/ports-2.15/200-fadvise64_64.patch rename to packages/glibc-ports/2.15/200-fadvise64_64.patch diff --git a/packages/glibc/ports-2.15/220-section-comments.patch b/packages/glibc-ports/2.15/220-section-comments.patch similarity index 100% rename from packages/glibc/ports-2.15/220-section-comments.patch rename to packages/glibc-ports/2.15/220-section-comments.patch diff --git a/packages/glibc/ports-2.15/230-no-inline-gmon.patch b/packages/glibc-ports/2.15/230-no-inline-gmon.patch similarity index 100% rename from packages/glibc/ports-2.15/230-no-inline-gmon.patch rename to packages/glibc-ports/2.15/230-no-inline-gmon.patch diff --git a/packages/glibc/ports-2.15/260-assume-pipe2.patch b/packages/glibc-ports/2.15/260-assume-pipe2.patch similarity index 100% rename from packages/glibc/ports-2.15/260-assume-pipe2.patch rename to packages/glibc-ports/2.15/260-assume-pipe2.patch diff --git a/packages/glibc/ports-2.15/270-china.patch b/packages/glibc-ports/2.15/270-china.patch similarity index 100% rename from packages/glibc/ports-2.15/270-china.patch rename to packages/glibc-ports/2.15/270-china.patch diff --git a/packages/glibc/ports-2.15/280-new-valencian-locale.patch b/packages/glibc-ports/2.15/280-new-valencian-locale.patch similarity index 100% rename from packages/glibc/ports-2.15/280-new-valencian-locale.patch rename to packages/glibc-ports/2.15/280-new-valencian-locale.patch diff --git a/packages/glibc/ports-2.15/300-nscd-one-fork.patch b/packages/glibc-ports/2.15/300-nscd-one-fork.patch similarity index 100% rename from packages/glibc/ports-2.15/300-nscd-one-fork.patch rename to packages/glibc-ports/2.15/300-nscd-one-fork.patch diff --git a/packages/glibc/ports-2.15/310-hppa-nptl-carlos.patch b/packages/glibc-ports/2.15/310-hppa-nptl-carlos.patch similarity index 100% rename from packages/glibc/ports-2.15/310-hppa-nptl-carlos.patch rename to packages/glibc-ports/2.15/310-hppa-nptl-carlos.patch diff --git a/packages/glibc/ports-2.15/330-m68k-sys-user.patch b/packages/glibc-ports/2.15/330-m68k-sys-user.patch similarity index 100% rename from packages/glibc/ports-2.15/330-m68k-sys-user.patch rename to packages/glibc-ports/2.15/330-m68k-sys-user.patch diff --git a/packages/glibc/ports-2.15/340-dl_execstack-PaX-support.patch b/packages/glibc-ports/2.15/340-dl_execstack-PaX-support.patch similarity index 100% rename from packages/glibc/ports-2.15/340-dl_execstack-PaX-support.patch rename to packages/glibc-ports/2.15/340-dl_execstack-PaX-support.patch diff --git a/packages/glibc/ports-2.15/350-pre20040117-pt_pax.patch b/packages/glibc-ports/2.15/350-pre20040117-pt_pax.patch similarity index 100% rename from packages/glibc/ports-2.15/350-pre20040117-pt_pax.patch rename to packages/glibc-ports/2.15/350-pre20040117-pt_pax.patch diff --git a/packages/glibc/ports-2.15/360-tests-sandbox-libdl-paths.patch b/packages/glibc-ports/2.15/360-tests-sandbox-libdl-paths.patch similarity index 100% rename from packages/glibc/ports-2.15/360-tests-sandbox-libdl-paths.patch rename to packages/glibc-ports/2.15/360-tests-sandbox-libdl-paths.patch diff --git a/packages/glibc/ports-2.15/380-dont-build-timezone.patch b/packages/glibc-ports/2.15/380-dont-build-timezone.patch similarity index 100% rename from packages/glibc/ports-2.15/380-dont-build-timezone.patch rename to packages/glibc-ports/2.15/380-dont-build-timezone.patch diff --git a/packages/glibc/ports-2.15/400-alpha-xstat.patch b/packages/glibc-ports/2.15/400-alpha-xstat.patch similarity index 100% rename from packages/glibc/ports-2.15/400-alpha-xstat.patch rename to packages/glibc-ports/2.15/400-alpha-xstat.patch diff --git a/packages/glibc/ports-2.15/430-alpha-creat.patch b/packages/glibc-ports/2.15/430-alpha-creat.patch similarity index 100% rename from packages/glibc/ports-2.15/430-alpha-creat.patch rename to packages/glibc-ports/2.15/430-alpha-creat.patch diff --git a/packages/glibc/ports-2.15/440-alpha-cache-shape.patch b/packages/glibc-ports/2.15/440-alpha-cache-shape.patch similarity index 100% rename from packages/glibc/ports-2.15/440-alpha-cache-shape.patch rename to packages/glibc-ports/2.15/440-alpha-cache-shape.patch diff --git a/packages/glibc/ports-2.15/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.15/460-alpha-fix-gcc-4.1-warnings.patch similarity index 100% rename from packages/glibc/ports-2.15/460-alpha-fix-gcc-4.1-warnings.patch rename to packages/glibc-ports/2.15/460-alpha-fix-gcc-4.1-warnings.patch diff --git a/packages/glibc/ports-2.15/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc-ports/2.15/490-alpha_alpha-add-fdatasync-support.patch similarity index 100% rename from packages/glibc/ports-2.15/490-alpha_alpha-add-fdatasync-support.patch rename to packages/glibc-ports/2.15/490-alpha_alpha-add-fdatasync-support.patch diff --git a/packages/glibc/ports-2.15/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.15/530-alpha-fix-rtld-fPIC.patch similarity index 100% rename from packages/glibc/ports-2.15/530-alpha-fix-rtld-fPIC.patch rename to packages/glibc-ports/2.15/530-alpha-fix-rtld-fPIC.patch diff --git a/packages/glibc/ports-2.15/560-ppc-atomic.patch b/packages/glibc-ports/2.15/560-ppc-atomic.patch similarity index 100% rename from packages/glibc/ports-2.15/560-ppc-atomic.patch rename to packages/glibc-ports/2.15/560-ppc-atomic.patch diff --git a/packages/glibc/ports-2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch similarity index 100% rename from packages/glibc/ports-2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch rename to packages/glibc-ports/2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch diff --git a/packages/glibc/ports-2.15/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.15/580-nptl-lowlevellock.patch similarity index 100% rename from packages/glibc/ports-2.15/580-nptl-lowlevellock.patch rename to packages/glibc-ports/2.15/580-nptl-lowlevellock.patch diff --git a/packages/glibc/ports-2.15/610-fpu-cw-mips.patch b/packages/glibc-ports/2.15/610-fpu-cw-mips.patch similarity index 100% rename from packages/glibc/ports-2.15/610-fpu-cw-mips.patch rename to packages/glibc-ports/2.15/610-fpu-cw-mips.patch diff --git a/packages/glibc/ports-2.15/630-mips_shn_undef-hack.patch b/packages/glibc-ports/2.15/630-mips_shn_undef-hack.patch similarity index 100% rename from packages/glibc/ports-2.15/630-mips_shn_undef-hack.patch rename to packages/glibc-ports/2.15/630-mips_shn_undef-hack.patch diff --git a/packages/glibc/ports-2.15/640-alpha-atfcts.patch b/packages/glibc-ports/2.15/640-alpha-atfcts.patch similarity index 100% rename from packages/glibc/ports-2.15/640-alpha-atfcts.patch rename to packages/glibc-ports/2.15/640-alpha-atfcts.patch diff --git a/packages/glibc/ports-2.15/650-syslog.patch b/packages/glibc-ports/2.15/650-syslog.patch similarity index 100% rename from packages/glibc/ports-2.15/650-syslog.patch rename to packages/glibc-ports/2.15/650-syslog.patch diff --git a/packages/glibc/ports-2.15/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc-ports/2.15/660-debug-readlink_chk-readklinkat_chk.patch similarity index 100% rename from packages/glibc/ports-2.15/660-debug-readlink_chk-readklinkat_chk.patch rename to packages/glibc-ports/2.15/660-debug-readlink_chk-readklinkat_chk.patch diff --git a/packages/glibc-ports/2.15/version.desc b/packages/glibc-ports/2.15/version.desc new file mode 100644 index 00000000..e69de29b diff --git a/packages/glibc/ports-2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch similarity index 100% rename from packages/glibc/ports-2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch rename to packages/glibc-ports/2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch diff --git a/packages/glibc/ports-2.16.0/100-respect-env-CPPFLAGS.patch b/packages/glibc-ports/2.16.0/100-respect-env-CPPFLAGS.patch similarity index 100% rename from packages/glibc/ports-2.16.0/100-respect-env-CPPFLAGS.patch rename to packages/glibc-ports/2.16.0/100-respect-env-CPPFLAGS.patch diff --git a/packages/glibc/ports-2.16.0/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc-ports/2.16.0/120-i386-x86_64-revert-clone-cfi.patch similarity index 100% rename from packages/glibc/ports-2.16.0/120-i386-x86_64-revert-clone-cfi.patch rename to packages/glibc-ports/2.16.0/120-i386-x86_64-revert-clone-cfi.patch diff --git a/packages/glibc/ports-2.16.0/140-disable-ldconfig.patch b/packages/glibc-ports/2.16.0/140-disable-ldconfig.patch similarity index 100% rename from packages/glibc/ports-2.16.0/140-disable-ldconfig.patch rename to packages/glibc-ports/2.16.0/140-disable-ldconfig.patch diff --git a/packages/glibc/ports-2.16.0/150-queue-header-updates.patch b/packages/glibc-ports/2.16.0/150-queue-header-updates.patch similarity index 100% rename from packages/glibc/ports-2.16.0/150-queue-header-updates.patch rename to packages/glibc-ports/2.16.0/150-queue-header-updates.patch diff --git a/packages/glibc/ports-2.16.0/170-localedef-fix-trampoline.patch b/packages/glibc-ports/2.16.0/170-localedef-fix-trampoline.patch similarity index 100% rename from packages/glibc/ports-2.16.0/170-localedef-fix-trampoline.patch rename to packages/glibc-ports/2.16.0/170-localedef-fix-trampoline.patch diff --git a/packages/glibc/ports-2.16.0/180-resolv-dynamic.patch b/packages/glibc-ports/2.16.0/180-resolv-dynamic.patch similarity index 100% rename from packages/glibc/ports-2.16.0/180-resolv-dynamic.patch rename to packages/glibc-ports/2.16.0/180-resolv-dynamic.patch diff --git a/packages/glibc/ports-2.16.0/200-fadvise64_64.patch b/packages/glibc-ports/2.16.0/200-fadvise64_64.patch similarity index 100% rename from packages/glibc/ports-2.16.0/200-fadvise64_64.patch rename to packages/glibc-ports/2.16.0/200-fadvise64_64.patch diff --git a/packages/glibc/ports-2.16.0/260-assume-pipe2.patch b/packages/glibc-ports/2.16.0/260-assume-pipe2.patch similarity index 100% rename from packages/glibc/ports-2.16.0/260-assume-pipe2.patch rename to packages/glibc-ports/2.16.0/260-assume-pipe2.patch diff --git a/packages/glibc/ports-2.16.0/270-china.patch b/packages/glibc-ports/2.16.0/270-china.patch similarity index 100% rename from packages/glibc/ports-2.16.0/270-china.patch rename to packages/glibc-ports/2.16.0/270-china.patch diff --git a/packages/glibc/ports-2.16.0/280-new-valencian-locale.patch b/packages/glibc-ports/2.16.0/280-new-valencian-locale.patch similarity index 100% rename from packages/glibc/ports-2.16.0/280-new-valencian-locale.patch rename to packages/glibc-ports/2.16.0/280-new-valencian-locale.patch diff --git a/packages/glibc/ports-2.16.0/300-nscd-one-fork.patch b/packages/glibc-ports/2.16.0/300-nscd-one-fork.patch similarity index 100% rename from packages/glibc/ports-2.16.0/300-nscd-one-fork.patch rename to packages/glibc-ports/2.16.0/300-nscd-one-fork.patch diff --git a/packages/glibc/ports-2.16.0/310-hppa-nptl-carlos.patch b/packages/glibc-ports/2.16.0/310-hppa-nptl-carlos.patch similarity index 100% rename from packages/glibc/ports-2.16.0/310-hppa-nptl-carlos.patch rename to packages/glibc-ports/2.16.0/310-hppa-nptl-carlos.patch diff --git a/packages/glibc/ports-2.16.0/330-m68k-sys-user.patch b/packages/glibc-ports/2.16.0/330-m68k-sys-user.patch similarity index 100% rename from packages/glibc/ports-2.16.0/330-m68k-sys-user.patch rename to packages/glibc-ports/2.16.0/330-m68k-sys-user.patch diff --git a/packages/glibc/ports-2.16.0/340-dl_execstack-PaX-support.patch b/packages/glibc-ports/2.16.0/340-dl_execstack-PaX-support.patch similarity index 100% rename from packages/glibc/ports-2.16.0/340-dl_execstack-PaX-support.patch rename to packages/glibc-ports/2.16.0/340-dl_execstack-PaX-support.patch diff --git a/packages/glibc/ports-2.16.0/350-pre20040117-pt_pax.patch b/packages/glibc-ports/2.16.0/350-pre20040117-pt_pax.patch similarity index 100% rename from packages/glibc/ports-2.16.0/350-pre20040117-pt_pax.patch rename to packages/glibc-ports/2.16.0/350-pre20040117-pt_pax.patch diff --git a/packages/glibc/ports-2.16.0/360-tests-sandbox-libdl-paths.patch b/packages/glibc-ports/2.16.0/360-tests-sandbox-libdl-paths.patch similarity index 100% rename from packages/glibc/ports-2.16.0/360-tests-sandbox-libdl-paths.patch rename to packages/glibc-ports/2.16.0/360-tests-sandbox-libdl-paths.patch diff --git a/packages/glibc/ports-2.16.0/380-dont-build-timezone.patch b/packages/glibc-ports/2.16.0/380-dont-build-timezone.patch similarity index 100% rename from packages/glibc/ports-2.16.0/380-dont-build-timezone.patch rename to packages/glibc-ports/2.16.0/380-dont-build-timezone.patch diff --git a/packages/glibc/ports-2.16.0/400-alpha-xstat.patch b/packages/glibc-ports/2.16.0/400-alpha-xstat.patch similarity index 100% rename from packages/glibc/ports-2.16.0/400-alpha-xstat.patch rename to packages/glibc-ports/2.16.0/400-alpha-xstat.patch diff --git a/packages/glibc/ports-2.16.0/430-alpha-creat.patch b/packages/glibc-ports/2.16.0/430-alpha-creat.patch similarity index 100% rename from packages/glibc/ports-2.16.0/430-alpha-creat.patch rename to packages/glibc-ports/2.16.0/430-alpha-creat.patch diff --git a/packages/glibc/ports-2.16.0/440-alpha-cache-shape.patch b/packages/glibc-ports/2.16.0/440-alpha-cache-shape.patch similarity index 100% rename from packages/glibc/ports-2.16.0/440-alpha-cache-shape.patch rename to packages/glibc-ports/2.16.0/440-alpha-cache-shape.patch diff --git a/packages/glibc/ports-2.16.0/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.16.0/460-alpha-fix-gcc-4.1-warnings.patch similarity index 100% rename from packages/glibc/ports-2.16.0/460-alpha-fix-gcc-4.1-warnings.patch rename to packages/glibc-ports/2.16.0/460-alpha-fix-gcc-4.1-warnings.patch diff --git a/packages/glibc/ports-2.16.0/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc-ports/2.16.0/490-alpha_alpha-add-fdatasync-support.patch similarity index 100% rename from packages/glibc/ports-2.16.0/490-alpha_alpha-add-fdatasync-support.patch rename to packages/glibc-ports/2.16.0/490-alpha_alpha-add-fdatasync-support.patch diff --git a/packages/glibc/ports-2.16.0/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.16.0/530-alpha-fix-rtld-fPIC.patch similarity index 100% rename from packages/glibc/ports-2.16.0/530-alpha-fix-rtld-fPIC.patch rename to packages/glibc-ports/2.16.0/530-alpha-fix-rtld-fPIC.patch diff --git a/packages/glibc/ports-2.16.0/560-ppc-atomic.patch b/packages/glibc-ports/2.16.0/560-ppc-atomic.patch similarity index 100% rename from packages/glibc/ports-2.16.0/560-ppc-atomic.patch rename to packages/glibc-ports/2.16.0/560-ppc-atomic.patch diff --git a/packages/glibc/ports-2.16.0/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch similarity index 100% rename from packages/glibc/ports-2.16.0/580-nptl-lowlevellock.patch rename to packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch diff --git a/packages/glibc/ports-2.16.0/610-fpu-cw-mips.patch b/packages/glibc-ports/2.16.0/610-fpu-cw-mips.patch similarity index 100% rename from packages/glibc/ports-2.16.0/610-fpu-cw-mips.patch rename to packages/glibc-ports/2.16.0/610-fpu-cw-mips.patch diff --git a/packages/glibc/ports-2.16.0/630-mips_shn_undef-hack.patch b/packages/glibc-ports/2.16.0/630-mips_shn_undef-hack.patch similarity index 100% rename from packages/glibc/ports-2.16.0/630-mips_shn_undef-hack.patch rename to packages/glibc-ports/2.16.0/630-mips_shn_undef-hack.patch diff --git a/packages/glibc/ports-2.16.0/640-alpha-atfcts.patch b/packages/glibc-ports/2.16.0/640-alpha-atfcts.patch similarity index 100% rename from packages/glibc/ports-2.16.0/640-alpha-atfcts.patch rename to packages/glibc-ports/2.16.0/640-alpha-atfcts.patch diff --git a/packages/glibc/ports-2.16.0/650-syslog.patch b/packages/glibc-ports/2.16.0/650-syslog.patch similarity index 100% rename from packages/glibc/ports-2.16.0/650-syslog.patch rename to packages/glibc-ports/2.16.0/650-syslog.patch diff --git a/packages/glibc/ports-2.16.0/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc-ports/2.16.0/660-debug-readlink_chk-readklinkat_chk.patch similarity index 100% rename from packages/glibc/ports-2.16.0/660-debug-readlink_chk-readklinkat_chk.patch rename to packages/glibc-ports/2.16.0/660-debug-readlink_chk-readklinkat_chk.patch diff --git a/packages/glibc-ports/2.16.0/version.desc b/packages/glibc-ports/2.16.0/version.desc new file mode 100644 index 00000000..e69de29b diff --git a/packages/glibc-ports/package.desc b/packages/glibc-ports/package.desc new file mode 100644 index 00000000..5df2f20c --- /dev/null +++ b/packages/glibc-ports/package.desc @@ -0,0 +1,8 @@ +# This is not a true package, but rather a part of glibc. When +# the ports were an external add-on, it used a separate repository +# and separate tarballs. +repository='git git://sourceware.org/git/glibc-ports.git' +mirrors='$(CT_Mirrors GNU glibc) $(CT_Mirrors sourceware glibc)' + +# Version of this package must be the same as the glibc's +versionlocked='glibc' diff --git a/packages/glibc/2.12.2/version.desc b/packages/glibc/2.12.2/version.desc index 026d275e..fcfe3891 100644 --- a/packages/glibc/2.12.2/version.desc +++ b/packages/glibc/2.12.2/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/glibc/2.13/version.desc b/packages/glibc/2.13/version.desc index 026d275e..fcfe3891 100644 --- a/packages/glibc/2.13/version.desc +++ b/packages/glibc/2.13/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/glibc/2.14.1/version.desc b/packages/glibc/2.14.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/glibc/2.14.1/version.desc +++ b/packages/glibc/2.14.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/glibc/2.14/version.desc b/packages/glibc/2.14/version.desc index 026d275e..fcfe3891 100644 --- a/packages/glibc/2.14/version.desc +++ b/packages/glibc/2.14/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/glibc/2.15/version.desc b/packages/glibc/2.15/version.desc index 026d275e..fcfe3891 100644 --- a/packages/glibc/2.15/version.desc +++ b/packages/glibc/2.15/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/glibc/2.16.0/version.desc b/packages/glibc/2.16.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/glibc/2.16.0/version.desc +++ b/packages/glibc/2.16.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/glibc/2.18/version.desc b/packages/glibc/2.18/version.desc index 026d275e..fcfe3891 100644 --- a/packages/glibc/2.18/version.desc +++ b/packages/glibc/2.18/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/glibc/2.20/version.desc b/packages/glibc/2.20/version.desc index 026d275e..fcfe3891 100644 --- a/packages/glibc/2.20/version.desc +++ b/packages/glibc/2.20/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/glibc/2.21/version.desc b/packages/glibc/2.21/version.desc index 026d275e..fcfe3891 100644 --- a/packages/glibc/2.21/version.desc +++ b/packages/glibc/2.21/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/glibc/2.22/version.desc b/packages/glibc/2.22/version.desc index 026d275e..fcfe3891 100644 --- a/packages/glibc/2.22/version.desc +++ b/packages/glibc/2.22/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/glibc/package.desc b/packages/glibc/package.desc index a7fd4990..f6cc8e24 100644 --- a/packages/glibc/package.desc +++ b/packages/glibc/package.desc @@ -1,3 +1,4 @@ -origin="GNU" -repository="git git://sourceware.org/git/glibc.git" -milestones="2.17 2.20 2.23" +origin='GNU' +repository='git git://sourceware.org/git/glibc.git' +mirrors='$(CT_Mirrors GNU glibc) $(CT_Mirrors sourceware glibc)' +milestones='2.17 2.20 2.23' diff --git a/packages/gmp/4.3.0/version.desc b/packages/gmp/4.3.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gmp/4.3.0/version.desc +++ b/packages/gmp/4.3.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gmp/4.3.1/version.desc b/packages/gmp/4.3.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gmp/4.3.1/version.desc +++ b/packages/gmp/4.3.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gmp/4.3.2/version.desc b/packages/gmp/4.3.2/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gmp/4.3.2/version.desc +++ b/packages/gmp/4.3.2/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gmp/5.0.1/version.desc b/packages/gmp/5.0.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gmp/5.0.1/version.desc +++ b/packages/gmp/5.0.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gmp/5.0.2/version.desc b/packages/gmp/5.0.2/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gmp/5.0.2/version.desc +++ b/packages/gmp/5.0.2/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gmp/5.1.1/version.desc b/packages/gmp/5.1.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gmp/5.1.1/version.desc +++ b/packages/gmp/5.1.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gmp/5.1.3/version.desc b/packages/gmp/5.1.3/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gmp/5.1.3/version.desc +++ b/packages/gmp/5.1.3/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gmp/6.0.0a/version.desc b/packages/gmp/6.0.0a/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gmp/6.0.0a/version.desc +++ b/packages/gmp/6.0.0a/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gmp/6.1.0/version.desc b/packages/gmp/6.1.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/gmp/6.1.0/version.desc +++ b/packages/gmp/6.1.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/gmp/package.desc b/packages/gmp/package.desc index 8a974366..a7ed6eff 100644 --- a/packages/gmp/package.desc +++ b/packages/gmp/package.desc @@ -1,2 +1,3 @@ -repository="hg https://gmplib.org/repo/gmp/" -milestones="5.1" +repository='hg https://gmplib.org/repo/gmp/' +mirrors='https://gmplib.org/download/gmp $(CT_Mirrors GNU gmp)' +milestones='5.1' diff --git a/packages/isl/0.11.1/version.desc b/packages/isl/0.11.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/isl/0.11.1/version.desc +++ b/packages/isl/0.11.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/isl/0.12.2/version.desc b/packages/isl/0.12.2/version.desc index 026d275e..fcfe3891 100644 --- a/packages/isl/0.12.2/version.desc +++ b/packages/isl/0.12.2/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/isl/0.14/version.desc b/packages/isl/0.14/version.desc index 026d275e..fcfe3891 100644 --- a/packages/isl/0.14/version.desc +++ b/packages/isl/0.14/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/isl/package.desc b/packages/isl/package.desc index 5fc14abe..e328b886 100644 --- a/packages/isl/package.desc +++ b/packages/isl/package.desc @@ -1,2 +1,3 @@ -repository="git git://repo.or.cz/isl.git" -milestones="0.12 0.14" +repository='git git://repo.or.cz/isl.git' +mirrors='http://isl.gforge.inria.fr' +milestones='0.12 0.14' diff --git a/packages/libelf/0.8.12/version.desc b/packages/libelf/0.8.12/version.desc index 026d275e..fcfe3891 100644 --- a/packages/libelf/0.8.12/version.desc +++ b/packages/libelf/0.8.12/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/libelf/package.desc b/packages/libelf/package.desc index b015c2d2..4720cd41 100644 --- a/packages/libelf/package.desc +++ b/packages/libelf/package.desc @@ -1,2 +1,3 @@ # FIXME No public repository and no new releases. # Consider switching to/adding project elftoolchain? +mirrors='http://www.mr511.de/software' diff --git a/packages/libiconv/1.14/version.desc b/packages/libiconv/1.14/version.desc index 026d275e..fcfe3891 100644 --- a/packages/libiconv/1.14/version.desc +++ b/packages/libiconv/1.14/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/libiconv/package.desc b/packages/libiconv/package.desc index eb8318e8..b733baef 100644 --- a/packages/libiconv/package.desc +++ b/packages/libiconv/package.desc @@ -1 +1,2 @@ -repository="git https://git.savannah.gnu.org/git/libiconv.git" +repository='git https://git.savannah.gnu.org/git/libiconv.git' +mirrors='$(CT_Mirrors GNU libiconv)' diff --git a/packages/libtool/package.desc b/packages/libtool/package.desc index 995546ea..2568f097 100644 --- a/packages/libtool/package.desc +++ b/packages/libtool/package.desc @@ -1 +1,2 @@ -repository="git git://git.savannah.gnu.org/libtool.git" +repository='git git://git.savannah.gnu.org/libtool.git' +mirrors='$(CT_Mirrors GNU libtool)' diff --git a/packages/linux/2.6.33.7/version.desc b/packages/linux/2.6.33.7/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/2.6.33.7/version.desc +++ b/packages/linux/2.6.33.7/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/2.6.34.7/version.desc b/packages/linux/2.6.34.7/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/2.6.34.7/version.desc +++ b/packages/linux/2.6.34.7/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/2.6.35.9/version.desc b/packages/linux/2.6.35.9/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/2.6.35.9/version.desc +++ b/packages/linux/2.6.35.9/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/2.6.36.4/version.desc b/packages/linux/2.6.36.4/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/2.6.36.4/version.desc +++ b/packages/linux/2.6.36.4/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/2.6.37.6/version.desc b/packages/linux/2.6.37.6/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/2.6.37.6/version.desc +++ b/packages/linux/2.6.37.6/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/2.6.38.8/version.desc b/packages/linux/2.6.38.8/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/2.6.38.8/version.desc +++ b/packages/linux/2.6.38.8/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/2.6.39.4/version.desc b/packages/linux/2.6.39.4/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/2.6.39.4/version.desc +++ b/packages/linux/2.6.39.4/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/3.0.101/version.desc b/packages/linux/3.0.101/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/3.0.101/version.desc +++ b/packages/linux/3.0.101/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/3.1.10/version.desc b/packages/linux/3.1.10/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/3.1.10/version.desc +++ b/packages/linux/3.1.10/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/3.11.10/version.desc b/packages/linux/3.11.10/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/3.11.10/version.desc +++ b/packages/linux/3.11.10/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/3.14.79/version.desc b/packages/linux/3.14.79/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/3.14.79/version.desc +++ b/packages/linux/3.14.79/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/3.15.10/version.desc b/packages/linux/3.15.10/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/3.15.10/version.desc +++ b/packages/linux/3.15.10/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/3.17.8/version.desc b/packages/linux/3.17.8/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/3.17.8/version.desc +++ b/packages/linux/3.17.8/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/3.18.48/version.desc b/packages/linux/3.18.48/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/3.18.48/version.desc +++ b/packages/linux/3.18.48/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/3.19.8/version.desc b/packages/linux/3.19.8/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/3.19.8/version.desc +++ b/packages/linux/3.19.8/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/3.3.8/version.desc b/packages/linux/3.3.8/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/3.3.8/version.desc +++ b/packages/linux/3.3.8/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/3.5.7/version.desc b/packages/linux/3.5.7/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/3.5.7/version.desc +++ b/packages/linux/3.5.7/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/3.6.11/version.desc b/packages/linux/3.6.11/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/3.6.11/version.desc +++ b/packages/linux/3.6.11/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/3.7.10/version.desc b/packages/linux/3.7.10/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/3.7.10/version.desc +++ b/packages/linux/3.7.10/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/3.8.13/version.desc b/packages/linux/3.8.13/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/3.8.13/version.desc +++ b/packages/linux/3.8.13/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/3.9.11/version.desc b/packages/linux/3.9.11/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/3.9.11/version.desc +++ b/packages/linux/3.9.11/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/4.0.9/version.desc b/packages/linux/4.0.9/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/4.0.9/version.desc +++ b/packages/linux/4.0.9/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/4.10.8/version.desc b/packages/linux/4.10.8/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/4.10.8/version.desc +++ b/packages/linux/4.10.8/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/4.2.8/version.desc b/packages/linux/4.2.8/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/4.2.8/version.desc +++ b/packages/linux/4.2.8/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/4.3.6/version.desc b/packages/linux/4.3.6/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/4.3.6/version.desc +++ b/packages/linux/4.3.6/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/4.5.7/version.desc b/packages/linux/4.5.7/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/4.5.7/version.desc +++ b/packages/linux/4.5.7/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/4.6.7/version.desc b/packages/linux/4.6.7/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/4.6.7/version.desc +++ b/packages/linux/4.6.7/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/4.7.10/version.desc b/packages/linux/4.7.10/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/4.7.10/version.desc +++ b/packages/linux/4.7.10/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/4.8.17/version.desc b/packages/linux/4.8.17/version.desc index 026d275e..fcfe3891 100644 --- a/packages/linux/4.8.17/version.desc +++ b/packages/linux/4.8.17/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/linux/package.desc b/packages/linux/package.desc index 2e5f7a30..e34f9e44 100644 --- a/packages/linux/package.desc +++ b/packages/linux/package.desc @@ -1 +1,2 @@ -repository="git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" +repository='git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git' +mirrors='$(CT_Mirrors linux ${CT_LINUX_VERSION})' diff --git a/packages/ltrace/0.5.3/version.desc b/packages/ltrace/0.5.3/version.desc index 026d275e..fcfe3891 100644 --- a/packages/ltrace/0.5.3/version.desc +++ b/packages/ltrace/0.5.3/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/ltrace/package.desc b/packages/ltrace/package.desc index d80e7ce2..73d781b7 100644 --- a/packages/ltrace/package.desc +++ b/packages/ltrace/package.desc @@ -1 +1,2 @@ -repository="git git://git.debian.org/git/collab-maint/ltrace.git" +repository='git git://git.debian.org/git/collab-maint/ltrace.git' +mirrors='http://ftp.debian.org/debian/pool/main/l/ltrace ftp:://ftp.debian.org/debian/pool/main/l/ltrace' diff --git a/packages/m4/1.4.13/version.desc b/packages/m4/1.4.13/version.desc index 026d275e..fcfe3891 100644 --- a/packages/m4/1.4.13/version.desc +++ b/packages/m4/1.4.13/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/m4/1.4.17/version.desc b/packages/m4/1.4.17/version.desc index 026d275e..fcfe3891 100644 --- a/packages/m4/1.4.17/version.desc +++ b/packages/m4/1.4.17/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/m4/package.desc b/packages/m4/package.desc index 555cdd1d..f0d62cee 100644 --- a/packages/m4/package.desc +++ b/packages/m4/package.desc @@ -1 +1,2 @@ -repository="git git://git.sv.gnu.org/m4" +repository='git git://git.sv.gnu.org/m4' +mirrors='$(CT_Mirrors GNU m4)' diff --git a/packages/make/3.81/version.desc b/packages/make/3.81/version.desc index 026d275e..fcfe3891 100644 --- a/packages/make/3.81/version.desc +++ b/packages/make/3.81/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/make/4.0/version.desc b/packages/make/4.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/make/4.0/version.desc +++ b/packages/make/4.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/make/4.1/version.desc b/packages/make/4.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/make/4.1/version.desc +++ b/packages/make/4.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/make/package.desc b/packages/make/package.desc index b0933247..8485d3e6 100644 --- a/packages/make/package.desc +++ b/packages/make/package.desc @@ -1 +1,2 @@ -repository="git https://git.savannah.gnu.org/git/make.git" +repository='git https://git.savannah.gnu.org/git/make.git' +mirrors='$(CT_Mirrors GNU make)' diff --git a/packages/mingw-w64/package.desc b/packages/mingw-w64/package.desc index 7bae1f7d..bbe507ac 100644 --- a/packages/mingw-w64/package.desc +++ b/packages/mingw-w64/package.desc @@ -1 +1,2 @@ -repository="git https://git.code.sf.net/p/mingw-w64/mingw-w64" +repository='git https://git.code.sf.net/p/mingw-w64/mingw-w64' +mirrors='http://downloads.sourceforge.net/sourceforge/mingw-w64 https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/' diff --git a/packages/mingw-w64/v2.0.7/version.desc b/packages/mingw-w64/v2.0.7/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mingw-w64/v2.0.7/version.desc +++ b/packages/mingw-w64/v2.0.7/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mingw-w64/v2.0.8/version.desc b/packages/mingw-w64/v2.0.8/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mingw-w64/v2.0.8/version.desc +++ b/packages/mingw-w64/v2.0.8/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mingw-w64/v2.0.9/version.desc b/packages/mingw-w64/v2.0.9/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mingw-w64/v2.0.9/version.desc +++ b/packages/mingw-w64/v2.0.9/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mingw-w64/v3.0.0/version.desc b/packages/mingw-w64/v3.0.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mingw-w64/v3.0.0/version.desc +++ b/packages/mingw-w64/v3.0.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mingw-w64/v3.1.0/version.desc b/packages/mingw-w64/v3.1.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mingw-w64/v3.1.0/version.desc +++ b/packages/mingw-w64/v3.1.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mingw-w64/v3.2.0/version.desc b/packages/mingw-w64/v3.2.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mingw-w64/v3.2.0/version.desc +++ b/packages/mingw-w64/v3.2.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mingw-w64/v3.3.0/version.desc b/packages/mingw-w64/v3.3.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mingw-w64/v3.3.0/version.desc +++ b/packages/mingw-w64/v3.3.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mingw-w64/v4.0.0/version.desc b/packages/mingw-w64/v4.0.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mingw-w64/v4.0.0/version.desc +++ b/packages/mingw-w64/v4.0.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mingw-w64/v4.0.1/version.desc b/packages/mingw-w64/v4.0.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mingw-w64/v4.0.1/version.desc +++ b/packages/mingw-w64/v4.0.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mingw-w64/v4.0.2/version.desc b/packages/mingw-w64/v4.0.2/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mingw-w64/v4.0.2/version.desc +++ b/packages/mingw-w64/v4.0.2/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mingw-w64/v4.0.4/version.desc b/packages/mingw-w64/v4.0.4/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mingw-w64/v4.0.4/version.desc +++ b/packages/mingw-w64/v4.0.4/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mingw-w64/v4.0.5/version.desc b/packages/mingw-w64/v4.0.5/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mingw-w64/v4.0.5/version.desc +++ b/packages/mingw-w64/v4.0.5/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mingw-w64/v5.0.0/version.desc b/packages/mingw-w64/v5.0.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mingw-w64/v5.0.0/version.desc +++ b/packages/mingw-w64/v5.0.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mpc/0.7/version.desc b/packages/mpc/0.7/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mpc/0.7/version.desc +++ b/packages/mpc/0.7/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mpc/0.8.1/version.desc b/packages/mpc/0.8.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mpc/0.8.1/version.desc +++ b/packages/mpc/0.8.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mpc/0.8.2/version.desc b/packages/mpc/0.8.2/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mpc/0.8.2/version.desc +++ b/packages/mpc/0.8.2/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mpc/0.9/version.desc b/packages/mpc/0.9/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mpc/0.9/version.desc +++ b/packages/mpc/0.9/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mpc/1.0.1/version.desc b/packages/mpc/1.0.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mpc/1.0.1/version.desc +++ b/packages/mpc/1.0.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mpc/1.0.2/version.desc b/packages/mpc/1.0.2/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mpc/1.0.2/version.desc +++ b/packages/mpc/1.0.2/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mpc/1.0/version.desc b/packages/mpc/1.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mpc/1.0/version.desc +++ b/packages/mpc/1.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mpc/package.desc b/packages/mpc/package.desc index 2a7e47c4..c3681600 100644 --- a/packages/mpc/package.desc +++ b/packages/mpc/package.desc @@ -1 +1,2 @@ -repository="git https://scm.gforge.inria.fr/anonscm/git/mpc/mpc.git" +repository='git https://scm.gforge.inria.fr/anonscm/git/mpc/mpc.git' +mirrors='http://www.multiprecision.org/mpc/download $(CT_Mirrors GNU mpc)' diff --git a/packages/mpfr/2.4.0/version.desc b/packages/mpfr/2.4.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mpfr/2.4.0/version.desc +++ b/packages/mpfr/2.4.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mpfr/2.4.1/version.desc b/packages/mpfr/2.4.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mpfr/2.4.1/version.desc +++ b/packages/mpfr/2.4.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mpfr/2.4.2/version.desc b/packages/mpfr/2.4.2/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mpfr/2.4.2/version.desc +++ b/packages/mpfr/2.4.2/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mpfr/3.0.0/version.desc b/packages/mpfr/3.0.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mpfr/3.0.0/version.desc +++ b/packages/mpfr/3.0.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mpfr/3.0.1/version.desc b/packages/mpfr/3.0.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mpfr/3.0.1/version.desc +++ b/packages/mpfr/3.0.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mpfr/3.1.0/version.desc b/packages/mpfr/3.1.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mpfr/3.1.0/version.desc +++ b/packages/mpfr/3.1.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mpfr/3.1.1/version.desc b/packages/mpfr/3.1.1/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mpfr/3.1.1/version.desc +++ b/packages/mpfr/3.1.1/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mpfr/3.1.2/version.desc b/packages/mpfr/3.1.2/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mpfr/3.1.2/version.desc +++ b/packages/mpfr/3.1.2/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mpfr/3.1.3/version.desc b/packages/mpfr/3.1.3/version.desc index 026d275e..fcfe3891 100644 --- a/packages/mpfr/3.1.3/version.desc +++ b/packages/mpfr/3.1.3/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/mpfr/package.desc b/packages/mpfr/package.desc index edd604a2..1eacb98f 100644 --- a/packages/mpfr/package.desc +++ b/packages/mpfr/package.desc @@ -1 +1,2 @@ -repository="svn https://scm.gforge.inria.fr/anonscm/svn/mpfr" +repository='svn https://scm.gforge.inria.fr/anonscm/svn/mpfr' +mirrors='http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)' diff --git a/packages/musl/1.1.15/version.desc b/packages/musl/1.1.15/version.desc index 026d275e..fcfe3891 100644 --- a/packages/musl/1.1.15/version.desc +++ b/packages/musl/1.1.15/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/musl/package.desc b/packages/musl/package.desc index 23870dd8..f1b73dce 100644 --- a/packages/musl/package.desc +++ b/packages/musl/package.desc @@ -1 +1,2 @@ -repository="git git://git.musl-libc.org/musl" +repository='git git://git.musl-libc.org/musl' +mirrors='http://www.musl-libc.org/releases' diff --git a/packages/ncurses/package.desc b/packages/ncurses/package.desc index 8b966f1e..bb5646d5 100644 --- a/packages/ncurses/package.desc +++ b/packages/ncurses/package.desc @@ -1 +1,2 @@ # No public repository for ncurses +mirrors='ftp://invisible-island.net/ncurses $(CT_Mirrors GNU ncurses)' diff --git a/packages/newlib-linaro/2.1.0-2014.09/version.desc b/packages/newlib-linaro/2.1.0-2014.09/version.desc index 026d275e..fcfe3891 100644 --- a/packages/newlib-linaro/2.1.0-2014.09/version.desc +++ b/packages/newlib-linaro/2.1.0-2014.09/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/newlib-linaro/2.2.0-2015.01/version.desc b/packages/newlib-linaro/2.2.0-2015.01/version.desc index 026d275e..fcfe3891 100644 --- a/packages/newlib-linaro/2.2.0-2015.01/version.desc +++ b/packages/newlib-linaro/2.2.0-2015.01/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/newlib-linaro/package.desc b/packages/newlib-linaro/package.desc index d1bc373c..a11646d2 100644 --- a/packages/newlib-linaro/package.desc +++ b/packages/newlib-linaro/package.desc @@ -1,4 +1,5 @@ -origin="Linaro" -master="newlib" -repository="git https://git.linaro.org/toolchain/newlib.git" -experimental="yes" +origin='Linaro' +master='newlib' +repository='git https://git.linaro.org/toolchain/newlib.git' +mirrors='$(CT_Mirrors Linaro newlib ${CT_NEWLIB_LINARO_VERSION})' +experimental='yes' diff --git a/packages/newlib/1.17.0/version.desc b/packages/newlib/1.17.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/newlib/1.17.0/version.desc +++ b/packages/newlib/1.17.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/newlib/1.18.0/version.desc b/packages/newlib/1.18.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/newlib/1.18.0/version.desc +++ b/packages/newlib/1.18.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/newlib/1.19.0/version.desc b/packages/newlib/1.19.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/newlib/1.19.0/version.desc +++ b/packages/newlib/1.19.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/newlib/1.20.0/version.desc b/packages/newlib/1.20.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/newlib/1.20.0/version.desc +++ b/packages/newlib/1.20.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/newlib/2.0.0/version.desc b/packages/newlib/2.0.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/newlib/2.0.0/version.desc +++ b/packages/newlib/2.0.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/newlib/2.1.0/version.desc b/packages/newlib/2.1.0/version.desc index 026d275e..fcfe3891 100644 --- a/packages/newlib/2.1.0/version.desc +++ b/packages/newlib/2.1.0/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/newlib/2.2.0.20151023/version.desc b/packages/newlib/2.2.0.20151023/version.desc index 026d275e..fcfe3891 100644 --- a/packages/newlib/2.2.0.20151023/version.desc +++ b/packages/newlib/2.2.0.20151023/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/newlib/2.3.0.20160226/version.desc b/packages/newlib/2.3.0.20160226/version.desc index 026d275e..fcfe3891 100644 --- a/packages/newlib/2.3.0.20160226/version.desc +++ b/packages/newlib/2.3.0.20160226/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/newlib/2.4.0.20161025/version.desc b/packages/newlib/2.4.0.20161025/version.desc index 026d275e..fcfe3891 100644 --- a/packages/newlib/2.4.0.20161025/version.desc +++ b/packages/newlib/2.4.0.20161025/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/newlib/package.desc b/packages/newlib/package.desc index 3abfe27b..56fe432c 100644 --- a/packages/newlib/package.desc +++ b/packages/newlib/package.desc @@ -1,3 +1,4 @@ -origin="RedHat" -repository="git git://sourceware.org/git/newlib-cygwin.git" -milestones="2.0" +origin='RedHat' +repository='git git://sourceware.org/git/newlib-cygwin.git' +mirrors='ftp://sourceware.org/pub/newlib' +milestones='2.0 2.1 2.2' diff --git a/packages/strace/4.10/version.desc b/packages/strace/4.10/version.desc index 026d275e..fcfe3891 100644 --- a/packages/strace/4.10/version.desc +++ b/packages/strace/4.10/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/strace/4.11/version.desc b/packages/strace/4.11/version.desc index 026d275e..fcfe3891 100644 --- a/packages/strace/4.11/version.desc +++ b/packages/strace/4.11/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/strace/4.12/version.desc b/packages/strace/4.12/version.desc index 026d275e..fcfe3891 100644 --- a/packages/strace/4.12/version.desc +++ b/packages/strace/4.12/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/strace/4.13/version.desc b/packages/strace/4.13/version.desc index 026d275e..fcfe3891 100644 --- a/packages/strace/4.13/version.desc +++ b/packages/strace/4.13/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/strace/4.14/version.desc b/packages/strace/4.14/version.desc index 026d275e..fcfe3891 100644 --- a/packages/strace/4.14/version.desc +++ b/packages/strace/4.14/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/strace/4.5.18/version.desc b/packages/strace/4.5.18/version.desc index 026d275e..fcfe3891 100644 --- a/packages/strace/4.5.18/version.desc +++ b/packages/strace/4.5.18/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/strace/4.5.19/version.desc b/packages/strace/4.5.19/version.desc index 026d275e..fcfe3891 100644 --- a/packages/strace/4.5.19/version.desc +++ b/packages/strace/4.5.19/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/strace/4.5.20/version.desc b/packages/strace/4.5.20/version.desc index 026d275e..fcfe3891 100644 --- a/packages/strace/4.5.20/version.desc +++ b/packages/strace/4.5.20/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/strace/4.6/version.desc b/packages/strace/4.6/version.desc index 026d275e..fcfe3891 100644 --- a/packages/strace/4.6/version.desc +++ b/packages/strace/4.6/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/strace/4.7/version.desc b/packages/strace/4.7/version.desc index 026d275e..fcfe3891 100644 --- a/packages/strace/4.7/version.desc +++ b/packages/strace/4.7/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/strace/4.8/version.desc b/packages/strace/4.8/version.desc index 026d275e..fcfe3891 100644 --- a/packages/strace/4.8/version.desc +++ b/packages/strace/4.8/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/strace/4.9/version.desc b/packages/strace/4.9/version.desc index 026d275e..fcfe3891 100644 --- a/packages/strace/4.9/version.desc +++ b/packages/strace/4.9/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/strace/package.desc b/packages/strace/package.desc index 9960dffd..e260df8e 100644 --- a/packages/strace/package.desc +++ b/packages/strace/package.desc @@ -1 +1,2 @@ -repository="git https://git.code.sf.net/p/strace/code" +repository='git https://git.code.sf.net/p/strace/code' +mirrors='http://downloads.sourceforge.net/project/strace/strace/${CT_STRACE_VERSION}' diff --git a/packages/uClibc-ng/1.0.20/version.desc b/packages/uClibc-ng/1.0.20/version.desc index 026d275e..fcfe3891 100644 --- a/packages/uClibc-ng/1.0.20/version.desc +++ b/packages/uClibc-ng/1.0.20/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/uClibc-ng/1.0.21/version.desc b/packages/uClibc-ng/1.0.21/version.desc index 026d275e..fcfe3891 100644 --- a/packages/uClibc-ng/1.0.21/version.desc +++ b/packages/uClibc-ng/1.0.21/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/uClibc-ng/package.desc b/packages/uClibc-ng/package.desc index 72cfd1a8..1d514fb7 100644 --- a/packages/uClibc-ng/package.desc +++ b/packages/uClibc-ng/package.desc @@ -1,3 +1,4 @@ -origin="uclibc-ng.org" -repository="git git://uclibc-ng.org/git/uclibc-ng" -milestones="0.9.33.2 1.0.0 1.0.15" +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/0.9.33.2/version.desc b/packages/uClibc/0.9.33.2/version.desc index 026d275e..fcfe3891 100644 --- a/packages/uClibc/0.9.33.2/version.desc +++ b/packages/uClibc/0.9.33.2/version.desc @@ -1 +1 @@ -obsolete="yes" +obsolete='yes' diff --git a/packages/uClibc/package.desc b/packages/uClibc/package.desc index ac3a8442..fd2050aa 100644 --- a/packages/uClibc/package.desc +++ b/packages/uClibc/package.desc @@ -1,5 +1,6 @@ # 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" -origin="uclibc.org" -repository="git git://git.busybox.net/uClibc" +master='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' diff --git a/packages/zlib/package.desc b/packages/zlib/package.desc index eea24eb0..789f3c7a 100644 --- a/packages/zlib/package.desc +++ b/packages/zlib/package.desc @@ -1 +1,2 @@ -repository="git https://github.com/madler/zlib.git" +repository='git https://github.com/madler/zlib.git' +mirrors='http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION}' diff --git a/samples/aarch64-unknown-linux-android/crosstool.config b/samples/aarch64-unknown-linux-android/crosstool.config index 295b219a..aa49e31d 100644 --- a/samples/aarch64-unknown-linux-android/crosstool.config +++ b/samples/aarch64-unknown-linux-android/crosstool.config @@ -4,7 +4,7 @@ CT_ARCH_64=y CT_ARCH_ARCH="armv8-a" CT_STATIC_TOOLCHAIN=y CT_KERNEL_linux=y -CT_LIBC_BIONIC_V_14b=y +CT_BIONIC_V_14b=y CT_ANDROID_API_21=y CT_CC_LANG_CXX=y CT_DEBUG_gdb=y diff --git a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config index 76174b62..3f948f89 100644 --- a/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config +++ b/samples/arm-cortex_a15-linux-gnueabihf/crosstool.config @@ -9,7 +9,6 @@ CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y CT_LIBC_glibc=y -CT_CC_GCC_SHOW_LINARO=y CT_CC_LANG_CXX=y CT_DEBUG_duma=y CT_DEBUG_gdb=y diff --git a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config index f5a57dd1..f34570ce 100644 --- a/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config +++ b/samples/arm-cortexa9_neon-linux-gnueabihf/crosstool.config @@ -11,10 +11,9 @@ CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y CT_LIBC_glibc=y -CT_LIBC_ADDONS_LIST="libidn" -CT_LIBC_LOCALES=y -CT_LIBC_GLIBC_KERNEL_VERSION_NONE=y -CT_CC_GCC_SHOW_LINARO=y +CT_GLIBC_USE_LIBIDN_ADDON=y +CT_GLIBC_LOCALES=y +CT_GLIBC_KERNEL_VERSION_NONE=y # CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set CT_CC_LANG_CXX=y CT_DEBUG_gdb=y diff --git a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config index 398a550b..8e7e00c5 100644 --- a/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config +++ b/samples/armv6-nommu-linux-uclibcgnueabi/crosstool.config @@ -7,7 +7,6 @@ CT_KERNEL_linux=y # CT_KERNEL_LINUX_INSTALL_CHECK is not set CT_BINUTILS_PLUGINS=y CT_THREADS_NONE=y -CT_CC_GCC_SHOW_LINARO=y CT_CC_GCC_DISABLE_PCH=y CT_CC_GCC_BUILD_ID=y CT_CC_GCC_LNK_HASH_STYLE_BOTH=y diff --git a/samples/armv6-rpi-linux-gnueabi/crosstool.config b/samples/armv6-rpi-linux-gnueabi/crosstool.config index 22fbfaac..c67c8d8b 100644 --- a/samples/armv6-rpi-linux-gnueabi/crosstool.config +++ b/samples/armv6-rpi-linux-gnueabi/crosstool.config @@ -4,16 +4,15 @@ CT_ARCH_CPU="arm1176jzf-s" CT_ARCH_FPU="vfp" CT_TARGET_VENDOR="rpi" CT_KERNEL_linux=y -CT_KERNEL_V_3_12=y +CT_LINUX_V_3_12=y CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y CT_LIBC_glibc=y -CT_LIBC_LOCALES=y -CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN=y -CT_LIBC_GLIBC_MIN_KERNEL_VERSION="3.2.27" -CT_CC_GCC_SHOW_LINARO=y +CT_GLIBC_LOCALES=y +CT_GLIBC_KERNEL_VERSION_CHOSEN=y +CT_GLIBC_MIN_KERNEL_VERSION="3.2.27" CT_CC_GCC_DISABLE_PCH=y CT_CC_GCC_BUILD_ID=y CT_CC_GCC_LNK_HASH_STYLE_BOTH=y diff --git a/samples/i686-centos6-linux-gnu/crosstool.config b/samples/i686-centos6-linux-gnu/crosstool.config index 86ec1f65..255b877a 100644 --- a/samples/i686-centos6-linux-gnu/crosstool.config +++ b/samples/i686-centos6-linux-gnu/crosstool.config @@ -3,8 +3,8 @@ CT_ARCH_x86=y CT_ARCH_ARCH="i686" CT_TARGET_VENDOR="centos6" CT_KERNEL_linux=y -CT_KERNEL_V_2_6_32=y +CT_LINUX_V_2_6_32=y CT_LIBC_glibc=y # CT_KERNEL_LINUX_INSTALL_CHECK is not set -CT_LIBC_GLIBC_V_2_12_2=y +CT_GLIBC_V_2_12_2=y CT_CC_LANG_CXX=y diff --git a/samples/i686-centos7-linux-gnu/crosstool.config b/samples/i686-centos7-linux-gnu/crosstool.config index b6403bbb..6d524d62 100644 --- a/samples/i686-centos7-linux-gnu/crosstool.config +++ b/samples/i686-centos7-linux-gnu/crosstool.config @@ -3,8 +3,8 @@ CT_ARCH_x86=y CT_ARCH_ARCH="i686" CT_TARGET_VENDOR="centos7" CT_KERNEL_linux=y -CT_KERNEL_V_3_10=y +CT_LINUX_V_3_10=y CT_LIBC_glibc=y # CT_KERNEL_LINUX_INSTALL_CHECK is not set -CT_LIBC_GLIBC_V_2_17=y +CT_GLIBC_V_2_17=y CT_CC_LANG_CXX=y diff --git a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config b/samples/i686-ubuntu12.04-linux-gnu/crosstool.config index 01c43127..320b091c 100644 --- a/samples/i686-ubuntu12.04-linux-gnu/crosstool.config +++ b/samples/i686-ubuntu12.04-linux-gnu/crosstool.config @@ -3,8 +3,8 @@ CT_ARCH_x86=y CT_ARCH_ARCH="i686" CT_TARGET_VENDOR="ubuntu12.04" CT_KERNEL_linux=y -CT_KERNEL_V_3_2=y +CT_LINUX_V_3_2=y CT_LIBC_glibc=y # CT_KERNEL_LINUX_INSTALL_CHECK is not set -CT_LIBC_GLIBC_V_2_15=y +CT_GLIBC_V_2_15=y CT_CC_LANG_CXX=y diff --git a/samples/i686-ubuntu14.04-linux-gnu/crosstool.config b/samples/i686-ubuntu14.04-linux-gnu/crosstool.config index e3f459bc..016f85d6 100644 --- a/samples/i686-ubuntu14.04-linux-gnu/crosstool.config +++ b/samples/i686-ubuntu14.04-linux-gnu/crosstool.config @@ -3,8 +3,8 @@ CT_ARCH_x86=y CT_ARCH_ARCH="i686" CT_TARGET_VENDOR="ubuntu14.04" CT_KERNEL_linux=y -CT_KERNEL_V_3_13=y +CT_LINUX_V_3_13=y CT_LIBC_glibc=y # CT_KERNEL_LINUX_INSTALL_CHECK is not set -CT_LIBC_GLIBC_V_2_19=y +CT_GLIBC_V_2_19=y CT_CC_LANG_CXX=y diff --git a/samples/i686-ubuntu16.04-linux-gnu/crosstool.config b/samples/i686-ubuntu16.04-linux-gnu/crosstool.config index 9eec3c19..e9b0d9ce 100644 --- a/samples/i686-ubuntu16.04-linux-gnu/crosstool.config +++ b/samples/i686-ubuntu16.04-linux-gnu/crosstool.config @@ -3,8 +3,8 @@ CT_ARCH_x86=y CT_ARCH_ARCH="i686" CT_TARGET_VENDOR="ubuntu16.04" CT_KERNEL_linux=y -CT_KERNEL_V_4_4=y +CT_LINUX_V_4_4=y CT_LIBC_glibc=y # CT_KERNEL_LINUX_INSTALL_CHECK is not set -CT_LIBC_GLIBC_V_2_23=y +CT_GLIBC_V_2_23=y CT_CC_LANG_CXX=y diff --git a/samples/powerpc-860-linux-gnu/crosstool.config b/samples/powerpc-860-linux-gnu/crosstool.config index eae5f91f..b6d3a467 100644 --- a/samples/powerpc-860-linux-gnu/crosstool.config +++ b/samples/powerpc-860-linux-gnu/crosstool.config @@ -4,7 +4,7 @@ CT_ARCH_FLOAT_SW=y CT_TARGET_VENDOR="860" CT_KERNEL_linux=y CT_BINUTILS_PLUGINS=y -CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY="--without-fp" +CT_GLIBC_EXTRA_CONFIG_ARRAY="--without-fp" CT_CC_LANG_CXX=y CT_DEBUG_gdb=y # CT_GDB_CROSS_PYTHON is not set diff --git a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config index d05e2b42..b86bf27e 100644 --- a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config +++ b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config @@ -6,7 +6,6 @@ CT_ARCH_powerpc_ABI_SPE=y CT_TARGET_VENDOR="e500v2" CT_KERNEL_linux=y CT_BINUTILS_EXTRA_CONFIG_ARRAY="--enable-spe=yes --enable-e500x2 --with-e500x2" -CT_CC_GCC_SHOW_LINARO=y CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-e500_double" CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-e500_double" # CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set diff --git a/samples/sh4-multilib-linux-uclibc/crosstool.config b/samples/sh4-multilib-linux-uclibc/crosstool.config index 2c616432..c3c6edad 100644 --- a/samples/sh4-multilib-linux-uclibc/crosstool.config +++ b/samples/sh4-multilib-linux-uclibc/crosstool.config @@ -4,7 +4,6 @@ CT_TARGET_VENDOR="multilib" CT_KERNEL_linux=y CT_BINUTILS_PLUGINS=y CT_LIBC_uClibc=y -CT_CC_GCC_V_4_9_4=y CT_CC_GCC_MULTILIB_LIST="m4a,m3" CT_CC_LANG_CXX=y CT_DEBUG_gdb=y diff --git a/samples/sparc-leon-linux-uclibc/crosstool.config b/samples/sparc-leon-linux-uclibc/crosstool.config index 02c346db..016cf699 100644 --- a/samples/sparc-leon-linux-uclibc/crosstool.config +++ b/samples/sparc-leon-linux-uclibc/crosstool.config @@ -4,12 +4,12 @@ CT_ARCH_TUNE="leon" CT_ARCH_FLOAT_SW=y CT_TARGET_VENDOR="leon" CT_KERNEL_linux=y -CT_KERNEL_V_3_10=y +CT_LINUX_V_3_10=y CT_LIBC_uClibc=y CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/uClibc.config" CT_LIBC_UCLIBC_IPV6=y CT_LIBC_UCLIBC_WCHAR=y -CT_CC_GCC_V_6_3_0=y +CT_GCC_V_6_3_0=y CT_CC_GCC_EXTRA_CONFIG_ARRAY="--disable-libitm" CT_CC_LANG_CXX=y CT_DEBUG_gdb=y diff --git a/samples/x86_64-centos6-linux-gnu/crosstool.config b/samples/x86_64-centos6-linux-gnu/crosstool.config index ad84a6c0..a2375a43 100644 --- a/samples/x86_64-centos6-linux-gnu/crosstool.config +++ b/samples/x86_64-centos6-linux-gnu/crosstool.config @@ -3,8 +3,8 @@ CT_ARCH_x86=y CT_ARCH_64=y CT_TARGET_VENDOR="centos6" CT_KERNEL_linux=y -CT_KERNEL_V_2_6_32=y +CT_LINUX_V_2_6_32=y CT_LIBC_glibc=y # CT_KERNEL_LINUX_INSTALL_CHECK is not set -CT_LIBC_GLIBC_V_2_12_2=y +CT_GLIBC_V_2_12_2=y CT_CC_LANG_CXX=y diff --git a/samples/x86_64-centos7-linux-gnu/crosstool.config b/samples/x86_64-centos7-linux-gnu/crosstool.config index 8ca023c1..db00ebb7 100644 --- a/samples/x86_64-centos7-linux-gnu/crosstool.config +++ b/samples/x86_64-centos7-linux-gnu/crosstool.config @@ -3,8 +3,8 @@ CT_ARCH_x86=y CT_ARCH_64=y CT_TARGET_VENDOR="centos7" CT_KERNEL_linux=y -CT_KERNEL_V_3_10=y +CT_LINUX_V_3_10=y CT_LIBC_glibc=y # CT_KERNEL_LINUX_INSTALL_CHECK is not set -CT_LIBC_GLIBC_V_2_17=y +CT_GLIBC_V_2_17=y CT_CC_LANG_CXX=y diff --git a/samples/x86_64-multilib-linux-gnu/crosstool.config b/samples/x86_64-multilib-linux-gnu/crosstool.config index d3e5b637..dabac91f 100644 --- a/samples/x86_64-multilib-linux-gnu/crosstool.config +++ b/samples/x86_64-multilib-linux-gnu/crosstool.config @@ -8,7 +8,7 @@ CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y CT_LIBC_glibc=y -CT_LIBC_GLIBC_KERNEL_VERSION_NONE=y +CT_GLIBC_KERNEL_VERSION_NONE=y CT_CC_GCC_MULTILIB_LIST="m64,m32,mx32" CT_CC_GCC_LNK_HASH_STYLE_BOTH=y CT_CC_LANG_CXX=y diff --git a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config index 3e2bc3fe..0a177e95 100644 --- a/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config +++ b/samples/x86_64-ubuntu12.04-linux-gnu/crosstool.config @@ -3,8 +3,8 @@ CT_ARCH_x86=y CT_ARCH_64=y CT_TARGET_VENDOR="ubuntu12.04" CT_KERNEL_linux=y -CT_KERNEL_V_3_2=y +CT_LINUX_V_3_2=y CT_LIBC_glibc=y # CT_KERNEL_LINUX_INSTALL_CHECK is not set -CT_LIBC_GLIBC_V_2_15=y +CT_GLIBC_V_2_15=y CT_CC_LANG_CXX=y diff --git a/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config index 4aa16c7c..234d9507 100644 --- a/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config +++ b/samples/x86_64-ubuntu14.04-linux-gnu/crosstool.config @@ -3,8 +3,8 @@ CT_ARCH_x86=y CT_ARCH_64=y CT_TARGET_VENDOR="ubuntu14.04" CT_KERNEL_linux=y -CT_KERNEL_V_3_13=y +CT_LINUX_V_3_13=y CT_LIBC_glibc=y # CT_KERNEL_LINUX_INSTALL_CHECK is not set -CT_LIBC_GLIBC_V_2_19=y +CT_GLIBC_V_2_19=y CT_CC_LANG_CXX=y diff --git a/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config b/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config index 37be3856..220f8181 100644 --- a/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config +++ b/samples/x86_64-ubuntu16.04-linux-gnu/crosstool.config @@ -3,8 +3,8 @@ CT_ARCH_x86=y CT_ARCH_64=y CT_TARGET_VENDOR="ubuntu16.04" CT_KERNEL_linux=y -CT_KERNEL_V_4_4=y +CT_LINUX_V_4_4=y CT_LIBC_glibc=y # CT_KERNEL_LINUX_INSTALL_CHECK is not set -CT_LIBC_GLIBC_V_2_23=y +CT_GLIBC_V_2_23=y CT_CC_LANG_CXX=y diff --git a/samples/x86_64-unknown-linux-gnu/crosstool.config b/samples/x86_64-unknown-linux-gnu/crosstool.config index 3f7c338e..a499b618 100644 --- a/samples/x86_64-unknown-linux-gnu/crosstool.config +++ b/samples/x86_64-unknown-linux-gnu/crosstool.config @@ -6,7 +6,7 @@ CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_BINUTILS_PLUGINS=y CT_LIBC_glibc=y -CT_LIBC_GLIBC_KERNEL_VERSION_NONE=y +CT_GLIBC_KERNEL_VERSION_NONE=y CT_CC_GCC_LNK_HASH_STYLE_BOTH=y CT_CC_LANG_CXX=y CT_DEBUG_gdb=y diff --git a/samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config b/samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config index 34d1ea1c..3d8cc416 100644 --- a/samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config +++ b/samples/x86_64-w64-mingw32,arm-cortexa9_neon-linux-gnueabihf/crosstool.config @@ -12,10 +12,9 @@ CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y CT_LIBC_glibc=y -CT_LIBC_ADDONS_LIST="libidn" -CT_LIBC_LOCALES=y -CT_LIBC_GLIBC_KERNEL_VERSION_NONE=y -CT_CC_GCC_SHOW_LINARO=y +CT_GLIBC_USE_LIBIDN_ADDON=y +CT_GLIBC_LOCALES=y +CT_GLIBC_KERNEL_VERSION_NONE=y # CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set CT_CC_LANG_CXX=y CT_DEBUG_gdb=y diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh index f378b4f1..74139bc3 100644 --- a/scripts/build/binutils/binutils.sh +++ b/scripts/build/binutils/binutils.sh @@ -4,44 +4,18 @@ # Download binutils do_binutils_get() { - if [ "${CT_BINUTILS_CUSTOM}" = "y" ]; then - CT_GetCustom "binutils" "${CT_BINUTILS_CUSTOM_VERSION}" \ - "${CT_BINUTILS_CUSTOM_LOCATION}" - else - case "${CT_BINUTILS_VERSION}" in - linaro-*) - CT_GetLinaro "binutils" "${CT_BINUTILS_VERSION}" - ;; - *) - CT_GetFile "binutils-${CT_BINUTILS_VERSION}" \ - {http,ftp}://{ftp.gnu.org/gnu,ftp.kernel.org/pub/linux/devel}/binutils \ - ftp://{sourceware.org,gcc.gnu.org}/pub/binutils/{releases,snapshots} - ;; - esac - fi - + CT_Fetch BINUTILS if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then - if [ "${CT_ELF2FLT_CUSTOM}" = "y" ]; then - CT_GetCustom "elf2flt" "${CT_ELF2FLT_CUSTOM_VERSION}" \ - "${CT_ELF2FLT_CUSTOM_LOCATION}" - else - CT_GetGit elf2flt "${CT_ELF2FLT_GIT_CSET}" https://github.com/uclinux-dev/elf2flt.git - fi + CT_Fetch ELF2FLT fi } # Extract binutils do_binutils_extract() { - CT_Extract "binutils-${CT_BINUTILS_VERSION}" - CT_Patch "binutils" "${CT_BINUTILS_VERSION}" - + # TBD handle xtensa overlays in CT_ExtractPatch + CT_ExtractPatch BINUTILS if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then - CT_Extract "elf2flt-${CT_ELF2FLT_GIT_CSET}" - CT_Patch "elf2flt" "${CT_ELF2FLT_GIT_CSET}" - fi - - if [ -n "${CT_ARCH_XTENSA_CUSTOM_NAME}" ]; then - CT_ConfigureXtensa "binutils" "${CT_BINUTILS_VERSION}" + CT_ExtractPatch ELF2FLT fi } @@ -67,7 +41,7 @@ do_binutils_for_build() { if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then # We re-use binutils' options, plus our owns - binutils_opts+=( "binutils_src=${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}" ) + binutils_opts+=( "binutils_src=${CT_SRC_DIR}/binutils" ) binutils_opts+=( "binutils_bld=${CT_BUILD_DIR}/build-binutils-build-${CT_BUILD}" ) CT_mkdir_pushd "${CT_BUILD_DIR}/build-elf2flt-build-${CT_BUILD}" @@ -100,7 +74,7 @@ do_binutils_for_host() { if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then # We re-use binutils' options, plus our owns - binutils_opts+=( "binutils_src=${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}" ) + binutils_opts+=( "binutils_src=${CT_SRC_DIR}/binutils" ) binutils_opts+=( "binutils_bld=${CT_BUILD_DIR}/build-binutils-host-${CT_HOST}" ) CT_mkdir_pushd "${CT_BUILD_DIR}/build-elf2flt-host-${CT_HOST}" @@ -207,7 +181,7 @@ do_binutils_backend() { CXXFLAGS="${cflags}" \ LDFLAGS="${ldflags}" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \ + "${CT_SRC_DIR}/binutils/configure" \ --build=${CT_BUILD} \ --host=${host} \ --target=${CT_TARGET} \ @@ -351,7 +325,7 @@ do_binutils_for_target() { CT_DoExecLog CFG \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}/configure" \ + "${CT_SRC_DIR}/binutils/configure" \ --build=${CT_BUILD} \ --host=${CT_TARGET} \ --target=${CT_TARGET} \ diff --git a/scripts/build/cc/100-gcc.sh b/scripts/build/cc/gcc.sh similarity index 96% rename from scripts/build/cc/100-gcc.sh rename to scripts/build/cc/gcc.sh index 2ca8e6f3..449aafb6 100644 --- a/scripts/build/cc/100-gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -7,30 +7,14 @@ do_gcc_get() { local linaro_version="" local linaro_series="" - if [ "${CT_CC_GCC_CUSTOM}" = "y" ]; then - CT_GetCustom "gcc" "${CT_CC_GCC_CUSTOM_VERSION}" \ - "${CT_CC_GCC_CUSTOM_LOCATION}" - else - case "${CT_CC_GCC_VERSION}" in - linaro-*) - CT_GetLinaro "gcc" "${CT_CC_GCC_VERSION}" - ;; - *) - # The official gcc hosts put gcc under a gcc/release/ directory, - # whereas the mirrors put it in the gcc/ directory. - CT_GetFile "gcc-${CT_CC_GCC_VERSION}" \ - {http,ftp,https}://ftp.gnu.org/gnu/gcc/gcc-${CT_CC_GCC_VERSION} \ - ftp://{gcc.gnu.org,sourceware.org}/pub/gcc/releases/gcc-${CT_CC_GCC_VERSION} - ;; - esac - fi # ! custom location + CT_Fetch GCC + # Starting with GCC 4.3, ecj is used for Java, and will only be # built if the configure script finds ecj.jar at the top of the # GCC source tree, which will not be there unless we get it and # put it there ourselves if [ "${CT_CC_LANG_JAVA_USE_ECJ}" = "y" ]; then CT_GetFile ecj-latest .jar http://mirrors.kernel.org/sourceware/java/ \ - http://crosstool-ng.org/pub/java \ ftp://gcc.gnu.org/pub/java \ ftp://sourceware.org/pub/java fi @@ -38,18 +22,12 @@ do_gcc_get() { # Extract gcc do_gcc_extract() { - CT_Extract "gcc-${CT_CC_GCC_VERSION}" - CT_Patch "gcc" "${CT_CC_GCC_VERSION}" + # TBD handle xtensa overlays + CT_ExtractPatch GCC # Copy ecj-latest.jar to ecj.jar at the top of the GCC source tree - if [ "${CT_CC_LANG_JAVA_USE_ECJ}" = "y" \ - -a ! -f "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/ecj.jar" \ - ]; then - CT_DoExecLog ALL cp -v "${CT_TARBALLS_DIR}/ecj-latest.jar" "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/ecj.jar" - fi - - if [ -n "${CT_ARCH_XTENSA_CUSTOM_NAME}" ]; then - CT_ConfigureXtensa "gcc" "${CT_CC_GCC_VERSION}" + if [ "${CT_CC_LANG_JAVA_USE_ECJ}" = "y" -a ! -f "${CT_SRC_DIR}/gcc/ecj.jar" ]; then + CT_DoExecLog ALL cp -v "${CT_TARBALLS_DIR}/ecj-latest.jar" "${CT_SRC_DIR}/gcc/ecj.jar" fi } @@ -575,7 +553,7 @@ do_gcc_core_backend() { CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \ LDFLAGS_FOR_TARGET="${CT_TARGET_LDFLAGS}" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/configure" \ + "${CT_SRC_DIR}/gcc/configure" \ --build=${CT_BUILD} \ --host=${host} \ --target=${CT_TARGET} \ @@ -603,7 +581,7 @@ do_gcc_core_backend() { # so we configure then build it. # Next we have to configure gcc, create libgcc.mk then edit it... # So much easier if we just edit the source tree, but hey... - if [ ! -f "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/BASE-VER" ]; then + if [ ! -f "${CT_SRC_DIR}/gcc/gcc/BASE-VER" ]; then CT_DoExecLog CFG make ${JOBSFLAGS} configure-libiberty CT_DoExecLog ALL make ${JOBSFLAGS} -C libiberty libiberty.a CT_DoExecLog CFG make ${JOBSFLAGS} configure-gcc configure-libcpp @@ -613,12 +591,12 @@ do_gcc_core_backend() { CT_DoExecLog ALL make ${JOBSFLAGS} all-libcpp all-build-libiberty fi # HACK: gcc-4.2 uses libdecnumber to build libgcc.mk, so build it here. - if [ -d "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/libdecnumber" ]; then + if [ -d "${CT_SRC_DIR}/gcc/libdecnumber" ]; then CT_DoExecLog CFG make ${JOBSFLAGS} configure-libdecnumber CT_DoExecLog ALL make ${JOBSFLAGS} -C libdecnumber libdecnumber.a fi # HACK: gcc-4.8 uses libbacktrace to make libgcc.mvars, so make it here. - if [ -d "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/libbacktrace" ]; then + if [ -d "${CT_SRC_DIR}/gcc/libbacktrace" ]; then CT_DoExecLog CFG make ${JOBSFLAGS} configure-libbacktrace CT_DoExecLog ALL make ${JOBSFLAGS} -C libbacktrace fi @@ -1121,7 +1099,7 @@ do_gcc_backend() { CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \ LDFLAGS_FOR_TARGET="${CT_TARGET_LDFLAGS}" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/configure" \ + "${CT_SRC_DIR}/gcc/configure" \ --build=${CT_BUILD} \ --host=${host} \ --target=${CT_TARGET} \ diff --git a/scripts/build/companion_libs/050-zlib.sh b/scripts/build/companion_libs/050-zlib.sh index a3ba6382..868bf3de 100644 --- a/scripts/build/companion_libs/050-zlib.sh +++ b/scripts/build/companion_libs/050-zlib.sh @@ -13,14 +13,12 @@ if [ "${CT_ZLIB}" = "y" ]; then # Download zlib do_zlib_get() { - CT_GetFile "zlib-${CT_ZLIB_VERSION}" \ - "http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION}" + CT_Fetch ZLIB } # Extract zlib do_zlib_extract() { - CT_Extract "zlib-${CT_ZLIB_VERSION}" - CT_Patch "zlib" "${CT_ZLIB_VERSION}" + CT_ExtractPatch ZLIB } # Build zlib for running on build @@ -87,7 +85,7 @@ do_zlib_backend() { # zlib treats mingw host differently and requires using a different # makefile rather than configure+make. It also does not support # out-of-tree building. - cp -av "${CT_SRC_DIR}/zlib-${CT_ZLIB_VERSION}/." . + cp -av "${CT_SRC_DIR}/zlib/." . extra_make=( -f win32/Makefile.gcc \ PREFIX="${host}-" \ SHAREDLIB= \ @@ -107,7 +105,7 @@ do_zlib_backend() { LDFLAGS="${ldflags}" \ CHOST="${host}" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/zlib-${CT_ZLIB_VERSION}/configure" \ + "${CT_SRC_DIR}/zlib/configure" \ --prefix="${prefix}" \ --static \ "${extra_config[@]}" diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh index 0fc5875a..272af662 100644 --- a/scripts/build/companion_libs/100-gmp.sh +++ b/scripts/build/companion_libs/100-gmp.sh @@ -13,15 +13,12 @@ if [ "${CT_GMP}" = "y" ]; then # Download GMP do_gmp_get() { - CT_GetFile "gmp-${CT_GMP_VERSION}" \ - https://gmplib.org/download/gmp \ - {http,ftp,https}://ftp.gnu.org/gnu/gmp + CT_Fetch GMP } # Extract GMP do_gmp_extract() { - CT_Extract "gmp-${CT_GMP_VERSION}" - CT_Patch "gmp" "${CT_GMP_VERSION}" + CT_ExtractPatch GMP } # Build GMP for running on build @@ -97,7 +94,7 @@ do_gmp_backend() { CFLAGS="${cflags} -fexceptions" \ LDFLAGS="${ldflags}" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/gmp-${CT_GMP_VERSION}/configure" \ + "${CT_SRC_DIR}/gmp/configure" \ --build=${CT_BUILD} \ --host=${host} \ --prefix="${prefix}" \ diff --git a/scripts/build/companion_libs/110-mpfr.sh b/scripts/build/companion_libs/110-mpfr.sh index 5a890774..b4be3f43 100644 --- a/scripts/build/companion_libs/110-mpfr.sh +++ b/scripts/build/companion_libs/110-mpfr.sh @@ -13,16 +13,14 @@ if [ "${CT_MPFR}" = "y" ]; then # Download MPFR do_mpfr_get() { - CT_GetFile "mpfr-${CT_MPFR_VERSION}" \ - {https,http,ftp}://ftp.gnu.org/gnu/mpfr \ - http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} + CT_Fetch MPFR } # Extract MPFR do_mpfr_extract() { - CT_Extract "mpfr-${CT_MPFR_VERSION}" - CT_Patch "mpfr" "${CT_MPFR_VERSION}" + CT_ExtractPatch MPFR + # TBD is it a problem with 2.4.x? The comment says it is not, yet the code is run # OK, Gentoo have a sanity check that libtool.m4 and ltmain.sh have the # same version number. Unfortunately, some tarballs of MPFR are not # built sanely, and thus ./configure fails on Gentoo. @@ -115,7 +113,7 @@ do_mpfr_backend() { CFLAGS="${cflags}" \ LDFLAGS="${ldflags}" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/mpfr-${CT_MPFR_VERSION}/configure" \ + "${CT_SRC_DIR}/mpfr/configure" \ --build=${CT_BUILD} \ --host=${host} \ --prefix="${prefix}" \ diff --git a/scripts/build/companion_libs/121-isl.sh b/scripts/build/companion_libs/121-isl.sh index 0b8777b4..d96e9cec 100644 --- a/scripts/build/companion_libs/121-isl.sh +++ b/scripts/build/companion_libs/121-isl.sh @@ -13,14 +13,12 @@ if [ "${CT_ISL}" = "y" ]; then # Download ISL do_isl_get() { - CT_GetFile "isl-${CT_ISL_VERSION}" \ - http://isl.gforge.inria.fr + CT_Fetch ISL } # Extract ISL do_isl_extract() { - CT_Extract "isl-${CT_ISL_VERSION}" - CT_Patch "isl" "${CT_ISL_VERSION}" + CT_ExtractPatch ISL } # Build ISL for running on build @@ -100,7 +98,7 @@ do_isl_backend() { CXXFLAGS="${cxxflags}" \ LDFLAGS="${ldflags}" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/isl-${CT_ISL_VERSION}/configure" \ + "${CT_SRC_DIR}/isl/configure" \ --build=${CT_BUILD} \ --host=${host} \ --prefix="${prefix}" \ diff --git a/scripts/build/companion_libs/130-cloog.sh b/scripts/build/companion_libs/130-cloog.sh index 6090b271..445d2597 100644 --- a/scripts/build/companion_libs/130-cloog.sh +++ b/scripts/build/companion_libs/130-cloog.sh @@ -13,18 +13,12 @@ if [ "${CT_CLOOG}" = "y" ]; then # Download CLooG do_cloog_get() { - CT_GetFile "cloog-${CT_CLOOG_VERSION}" \ - http://www.bastoul.net/cloog/pages/download \ - ftp://gcc.gnu.org/pub/gcc/infrastructure + CT_Fetch CLOOG } # Extract CLooG do_cloog_extract() { - CT_Extract "cloog-${CT_CLOOG_VERSION}" - CT_Patch "cloog" "${CT_CLOOG_VERSION}" - - # Help the autostuff in case it thinks there are things to regenerate... - CT_DoExecLog DEBUG mkdir -p "${CT_SRC_DIR}/cloog-${CT_CLOOG_VERSION}/m4" + CT_ExtractPatch CLOOG } # Build CLooG for running on build @@ -98,7 +92,7 @@ do_cloog_backend() { LDFLAGS="${ldflags}" \ LIBS="-lm" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/cloog-${CT_CLOOG_VERSION}/configure" \ + "${CT_SRC_DIR}/cloog/configure" \ --build=${CT_BUILD} \ --host=${host} \ --prefix="${prefix}" \ diff --git a/scripts/build/companion_libs/140-mpc.sh b/scripts/build/companion_libs/140-mpc.sh index e6efb4f7..3136ab41 100644 --- a/scripts/build/companion_libs/140-mpc.sh +++ b/scripts/build/companion_libs/140-mpc.sh @@ -13,15 +13,12 @@ if [ "${CT_MPC}" = "y" ]; then # Download MPC do_mpc_get() { - CT_GetFile "mpc-${CT_MPC_VERSION}" .tar.gz \ - {http,ftp,https}://ftp.gnu.org/gnu/mpc \ - http://www.multiprecision.org/mpc/download + CT_Fetch MPC } # Extract MPC do_mpc_extract() { - CT_Extract "mpc-${CT_MPC_VERSION}" - CT_Patch "mpc" "${CT_MPC_VERSION}" + CT_ExtractPatch MPC } # Build MPC for running on build @@ -87,7 +84,7 @@ do_mpc_backend() { CFLAGS="${cflags}" \ LDFLAGS="${ldflags}" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/mpc-${CT_MPC_VERSION}/configure" \ + "${CT_SRC_DIR}/mpc/configure" \ --build=${CT_BUILD} \ --host=${host} \ --prefix="${prefix}" \ diff --git a/scripts/build/companion_libs/200-libelf.sh b/scripts/build/companion_libs/200-libelf.sh index 807ce7e9..d1ac0b42 100644 --- a/scripts/build/companion_libs/200-libelf.sh +++ b/scripts/build/companion_libs/200-libelf.sh @@ -9,15 +9,11 @@ do_libelf_for_target() { :; } if [ "${CT_LIBELF}" = "y" -o "${CT_LIBELF_TARGET}" = "y" ]; then do_libelf_get() { - # The server hosting libelf will return an "HTTP 300 : Multiple Choices" - # error code if we try to download a file that does not exists there. - # So we have to request the file with an explicit extension. - CT_GetFile "libelf-${CT_LIBELF_VERSION}" .tar.gz http://www.mr511.de/software/ + CT_Fetch LIBELF } do_libelf_extract() { - CT_Extract "libelf-${CT_LIBELF_VERSION}" - CT_Patch "libelf" "${CT_LIBELF_VERSION}" + CT_ExtractPatch LIBELF } if [ "${CT_LIBELF}" = "y" ]; then @@ -131,7 +127,7 @@ do_libelf_backend() { CFLAGS="${cflags} -fPIC" \ LDFLAGS="${ldflags}" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/libelf-${CT_LIBELF_VERSION}/configure" \ + "${CT_SRC_DIR}/libelf/configure" \ --build=${CT_BUILD} \ --host=${host} \ --target=${CT_TARGET} \ diff --git a/scripts/build/companion_libs/210-expat.sh b/scripts/build/companion_libs/210-expat.sh index 5aa8e31b..dcb72081 100644 --- a/scripts/build/companion_libs/210-expat.sh +++ b/scripts/build/companion_libs/210-expat.sh @@ -9,13 +9,11 @@ do_expat_for_target() { :; } if [ "${CT_EXPAT_TARGET}" = "y" -o "${CT_EXPAT}" = "y" ]; then do_expat_get() { - CT_GetFile "expat-${CT_EXPAT_VERSION}" .tar.gz \ - http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION} + CT_Fetch EXPAT } do_expat_extract() { - CT_Extract "expat-${CT_EXPAT_VERSION}" - CT_Patch "expat" "${CT_EXPAT_VERSION}" + CT_ExtractPatch EXPAT } if [ "${CT_EXPAT}" = "y" ]; then @@ -95,7 +93,7 @@ do_expat_backend() { CFLAGS="${cflags}" \ LDFLAGS="${ldflags}" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/expat-${CT_EXPAT_VERSION}/configure" \ + "${CT_SRC_DIR}/expat/configure" \ --build=${CT_BUILD} \ --host=${host} \ --prefix="${prefix}" \ diff --git a/scripts/build/companion_libs/220-ncurses.sh b/scripts/build/companion_libs/220-ncurses.sh index 7a1379d0..815cf4b0 100644 --- a/scripts/build/companion_libs/220-ncurses.sh +++ b/scripts/build/companion_libs/220-ncurses.sh @@ -9,15 +9,11 @@ do_ncurses_for_target() { :; } if [ "${CT_NCURSES_TARGET}" = "y" -o "${CT_NCURSES}" = "y" ]; then do_ncurses_get() { - CT_GetFile "ncurses-${CT_NCURSES_VERSION}" .tar.gz \ - {http,ftp,https}://ftp.gnu.org/pub/gnu/ncurses \ - ftp://invisible-island.net/ncurses + CT_Fetch NCURSES } do_ncurses_extract() { - CT_Extract "ncurses-${CT_NCURSES_VERSION}" - CT_DoExecLog ALL chmod -R u+w "${CT_SRC_DIR}/ncurses-${CT_NCURSES_VERSION}" - CT_Patch "ncurses" "${CT_NCURSES_VERSION}" + CT_ExtractPatch NCURSES } # We need tic that runs on the build when building ncurses for host/target @@ -157,7 +153,7 @@ do_ncurses_backend() { CFLAGS="${cflags}" \ LDFLAGS="${ldflags}" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/ncurses-${CT_NCURSES_VERSION}/configure" \ + "${CT_SRC_DIR}/ncurses/configure" \ --build=${CT_BUILD} \ --host=${host} \ --prefix="${prefix}" \ diff --git a/scripts/build/companion_libs/320-libiconv.sh b/scripts/build/companion_libs/320-libiconv.sh index f2f0bef8..ad571a9b 100644 --- a/scripts/build/companion_libs/320-libiconv.sh +++ b/scripts/build/companion_libs/320-libiconv.sh @@ -9,13 +9,11 @@ do_libiconv_for_target() { :; } if [ "${CT_LIBICONV}" = "y" ]; then do_libiconv_get() { - CT_GetFile "libiconv-${CT_LIBICONV_VERSION}" \ - http://ftp.gnu.org/pub/gnu/libiconv/ + CT_Fetch LIBICONV } do_libiconv_extract() { - CT_Extract "libiconv-${CT_LIBICONV_VERSION}" - CT_Patch "libiconv" "${CT_LIBICONV_VERSION}" + CT_ExtractPatch LIBICONV } # Build libiconv for running on build @@ -93,7 +91,7 @@ do_libiconv_backend() { CFLAGS="${cflags}" \ LDFLAGS="${ldflags}" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/libiconv-${CT_LIBICONV_VERSION}/configure" \ + "${CT_SRC_DIR}/libiconv/configure" \ --build=${CT_BUILD} \ --host="${host}" \ --prefix="${prefix}" \ diff --git a/scripts/build/companion_libs/330-gettext.sh b/scripts/build/companion_libs/330-gettext.sh index 8828e5de..f3f14971 100644 --- a/scripts/build/companion_libs/330-gettext.sh +++ b/scripts/build/companion_libs/330-gettext.sh @@ -9,13 +9,11 @@ do_gettext_for_target() { :; } if [ "${CT_GETTEXT}" = "y" ]; then do_gettext_get() { - CT_GetFile "gettext-${CT_GETTEXT_VERSION}" \ - http://ftp.gnu.org/pub/gnu/gettext/ + CT_Fetch GETTEXT } do_gettext_extract() { - CT_Extract "gettext-${CT_GETTEXT_VERSION}" - CT_Patch "gettext" "${CT_GETTEXT_VERSION}" + CT_ExtractPatch GETTEXT } # Build gettext for running on build @@ -112,7 +110,7 @@ do_gettext_backend() { CFLAGS="${cflags}" \ LDFLAGS="${ldflags}" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/gettext-${CT_GETTEXT_VERSION}/configure" \ + "${CT_SRC_DIR}/gettext/configure" \ --build=${CT_BUILD} \ --host="${host}" \ --prefix="${prefix}" \ diff --git a/scripts/build/companion_tools/050-make.sh b/scripts/build/companion_tools/050-make.sh index 76b24aaf..3253f5b9 100644 --- a/scripts/build/companion_tools/050-make.sh +++ b/scripts/build/companion_tools/050-make.sh @@ -1,14 +1,11 @@ # Build script for make do_companion_tools_make_get() { - CT_GetFile "make-${CT_MAKE_VERSION}" \ - {http,ftp,https}://ftp.gnu.org/gnu/make + CT_Fetch MAKE } do_companion_tools_make_extract() { - CT_Extract "make-${CT_MAKE_VERSION}" - CT_DoExecLog ALL chmod -R u+w "${CT_SRC_DIR}/make-${CT_MAKE_VERSION}" - CT_Patch "make" "${CT_MAKE_VERSION}" + CT_ExtractPatch MAKE } do_companion_tools_make_for_build() { @@ -61,7 +58,7 @@ do_make_backend() { CFLAGS="${cflags}" \ LDFLAGS="${ldflags}" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/make-${CT_MAKE_VERSION}/configure" \ + "${CT_SRC_DIR}/make/configure" \ --host="${host}" \ --prefix="${prefix}" \ "${extra_config[@]}" diff --git a/scripts/build/companion_tools/100-m4.sh b/scripts/build/companion_tools/100-m4.sh index e0fccd7d..1707d642 100644 --- a/scripts/build/companion_tools/100-m4.sh +++ b/scripts/build/companion_tools/100-m4.sh @@ -1,13 +1,11 @@ # Build script for m4 do_companion_tools_m4_get() { - CT_GetFile "m4-${CT_M4_VERSION}" \ - {http,ftp,https}://ftp.gnu.org/gnu/m4 + CT_Fetch M4 } do_companion_tools_m4_extract() { - CT_Extract "m4-${CT_M4_VERSION}" - CT_Patch "m4" "${CT_M4_VERSION}" + CT_ExtractPatch M4 } do_companion_tools_m4_for_build() { @@ -58,7 +56,7 @@ do_m4_backend() { CFLAGS="${cflags}" \ LDFLAGS="${ldflags}" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/m4-${CT_M4_VERSION}/configure" \ + "${CT_SRC_DIR}/m4/configure" \ --host="${host}" \ --prefix="${prefix}" diff --git a/scripts/build/companion_tools/200-autoconf.sh b/scripts/build/companion_tools/200-autoconf.sh index bccef758..52149ea7 100644 --- a/scripts/build/companion_tools/200-autoconf.sh +++ b/scripts/build/companion_tools/200-autoconf.sh @@ -1,14 +1,11 @@ # Build script for autoconf do_companion_tools_autoconf_get() { - CT_GetFile "autoconf-${CT_AUTOCONF_VERSION}" \ - {http,ftp,https}://ftp.gnu.org/gnu/autoconf + CT_Fetch AUTOCONF } do_companion_tools_autoconf_extract() { - CT_Extract "autoconf-${CT_AUTOCONF_VERSION}" - CT_DoExecLog ALL chmod -R u+w "${CT_SRC_DIR}/autoconf-${CT_AUTOCONF_VERSION}" - CT_Patch "autoconf" "${CT_AUTOCONF_VERSION}" + CT_ExtractPatch AUTOCONF } do_companion_tools_autoconf_for_build() { @@ -42,7 +39,7 @@ do_autoconf_backend() { CT_DoLog EXTRA "Configuring autoconf" CT_DoExecLog CFG \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/autoconf-${CT_AUTOCONF_VERSION}/configure" \ + "${CT_SRC_DIR}/autoconf/configure" \ --host="${host}" \ --prefix="${prefix}" diff --git a/scripts/build/companion_tools/300-automake.sh b/scripts/build/companion_tools/300-automake.sh index ee76463f..2d7ededd 100644 --- a/scripts/build/companion_tools/300-automake.sh +++ b/scripts/build/companion_tools/300-automake.sh @@ -1,14 +1,11 @@ # Build script for automake do_companion_tools_automake_get() { - CT_GetFile "automake-${CT_AUTOMAKE_VERSION}" \ - {http,ftp,https}://ftp.gnu.org/gnu/automake + CT_Fetch AUTOMAKE } do_companion_tools_automake_extract() { - CT_Extract "automake-${CT_AUTOMAKE_VERSION}" - CT_DoExecLog ALL chmod -R u+w "${CT_SRC_DIR}/automake-${CT_AUTOMAKE_VERSION}" - CT_Patch "automake" "${CT_AUTOMAKE_VERSION}" + CT_ExtractPatch AUTOMAKE } do_companion_tools_automake_for_build() { @@ -38,7 +35,7 @@ do_automake_backend() { CT_DoLog EXTRA "Configuring automake" CT_DoExecLog CFG \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/automake-${CT_AUTOMAKE_VERSION}/configure" \ + "${CT_SRC_DIR}/automake/configure" \ --host="${host}" \ --prefix="${prefix}" diff --git a/scripts/build/companion_tools/400-libtool.sh b/scripts/build/companion_tools/400-libtool.sh index 4461207b..37330720 100644 --- a/scripts/build/companion_tools/400-libtool.sh +++ b/scripts/build/companion_tools/400-libtool.sh @@ -1,14 +1,11 @@ # Build script for libtool do_companion_tools_libtool_get() { - CT_GetFile "libtool-${CT_LIBTOOL_VERSION}" \ - {http,ftp,https}://ftp.gnu.org/gnu/libtool + CT_Fetch LIBTOOL } do_companion_tools_libtool_extract() { - CT_Extract "libtool-${CT_LIBTOOL_VERSION}" - CT_DoExecLog ALL chmod -R u+w "${CT_SRC_DIR}/libtool-${CT_LIBTOOL_VERSION}" - CT_Patch "libtool" "${CT_LIBTOOL_VERSION}" + CT_ExtractPatch LIBTOOL } do_companion_tools_libtool_for_build() { @@ -38,7 +35,7 @@ do_libtool_backend() { CT_DoLog EXTRA "Configuring libtool" CT_DoExecLog CFG \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/libtool-${CT_LIBTOOL_VERSION}/configure" \ + "${CT_SRC_DIR}/libtool/configure" \ --host="${host}" \ --prefix="${prefix}" diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh index 2a9b01f8..afaeb027 100644 --- a/scripts/build/debug/200-duma.sh +++ b/scripts/build/debug/200-duma.sh @@ -1,24 +1,12 @@ # Build script for D.U.M.A. do_debug_duma_get() { - local dl_base - - dl_base="http://downloads.sourceforge.net/project/duma/duma" - dl_base+="/${CT_DUMA_VERSION//_/.}" - - # Downloading an non-existing file from sourceforge will give you an - # HTML file containing an error message, instead of returning a 404. - # Sigh... - CT_GetFile "duma_${CT_DUMA_VERSION}" .tar.gz "${dl_base}" - # Downloading from sourceforge may leave garbage, cleanup - CT_DoExecLog ALL rm -f "${CT_TARBALLS_DIR}/showfiles.php"* + # TBD need cleanup after sourceforge.net download? + CT_Fetch DUMA } do_debug_duma_extract() { - CT_Extract "duma_${CT_DUMA_VERSION}" - CT_Pushd "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}" - CT_Patch nochdir "duma" "${CT_DUMA_VERSION}" - CT_Popd + CT_ExtractPatch DUMA } do_debug_duma_build() { @@ -26,7 +14,7 @@ do_debug_duma_build() { CT_DoStep INFO "Installing D.U.M.A." CT_DoLog EXTRA "Copying sources" - cp -a "${CT_SRC_DIR}/duma_${CT_DUMA_VERSION}/." "${CT_BUILD_DIR}/build-duma" + cp -a "${CT_SRC_DIR}/duma/." "${CT_BUILD_DIR}/build-duma" CT_Pushd "${CT_BUILD_DIR}/build-duma" make_args=( diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index e5276d0f..cdc70474 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -1,40 +1,18 @@ # Build script for the gdb debug facility do_debug_gdb_get() { - local linaro_version="" - local linaro_series="" - - if [ "${CT_GDB_CUSTOM}" = "y" ]; then - CT_GetCustom "gdb" "${CT_GDB_CUSTOM_VERSION}" \ - "${CT_GDB_CUSTOM_LOCATION}" - else - case "${CT_GDB_VERSION}" in - linaro-*) - CT_GetLinaro "gdb" "${CT_GDB_VERSION}" - ;; - *) - CT_GetFile "gdb-${CT_GDB_VERSION}" \ - http://mirrors.kernel.org/sourceware/gdb \ - {http,ftp,https}://ftp.gnu.org/pub/gnu/gdb \ - ftp://{sourceware.org,gcc.gnu.org}/pub/gdb/releases - ;; - esac - fi + CT_Fetch GDB } do_debug_gdb_extract() { - CT_Extract "gdb-${CT_GDB_VERSION}" - CT_Patch "gdb" "${CT_GDB_VERSION}" - - if [ -n "${CT_ARCH_XTENSA_CUSTOM_NAME}" ]; then - CT_ConfigureXtensa "gdb" "${CT_GDB_VERSION}" - fi + # TBD xtensa overlays + CT_ExtractPatch GDB } do_debug_gdb_build() { local -a extra_config - gdb_src_dir="${CT_SRC_DIR}/gdb-${CT_GDB_VERSION}" + gdb_src_dir="${CT_SRC_DIR}/gdb" # Version 6.3 and below behave badly with gdbmi case "${CT_GDB_VERSION}" in @@ -174,11 +152,12 @@ do_debug_gdb_build() { if [ "${CT_GDB_INSTALL_GDBINIT}" = "y" ]; then CT_DoLog EXTRA "Installing '.gdbinit' template" # See in scripts/build/internals.sh for why we do this - if [ -f "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/BASE-VER" ]; then - gcc_version=$( cat "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/BASE-VER" ) + # TBD GCC 3.x and older not supported + if [ -f "${CT_SRC_DIR}/gcc/gcc/BASE-VER" ]; then + gcc_version=$( cat "${CT_SRC_DIR}/gcc/gcc/BASE-VER" ) else gcc_version=$(sed -r -e '/version_string/!d; s/^.+= "([^"]+)".*$/\1/;' \ - "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/version.c" \ + "${CT_SRC_DIR}/gcc/gcc/version.c" \ ) fi sed -r \ diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh index 6b860e92..ce299c2e 100644 --- a/scripts/build/debug/400-ltrace.sh +++ b/scripts/build/debug/400-ltrace.sh @@ -1,19 +1,11 @@ # Build script for ltrace do_debug_ltrace_get() { - CT_GetFile "ltrace_${CT_LTRACE_VERSION}.orig" .tar.gz \ - {http,ftp}://ftp.debian.org/debian/pool/main/l/ltrace/ - # Create a link so that the following steps are easier to do: - CT_Pushd "${CT_TARBALLS_DIR}" - ltrace_ext=$(CT_GetFileExtension "ltrace_${CT_LTRACE_VERSION}.orig") - ln -sf "ltrace_${CT_LTRACE_VERSION}.orig${ltrace_ext}" \ - "ltrace-${CT_LTRACE_VERSION}${ltrace_ext}" - CT_Popd + CT_Fetch LTRACE } do_debug_ltrace_extract() { - CT_Extract "ltrace-${CT_LTRACE_VERSION}" - CT_Patch "ltrace" "${CT_LTRACE_VERSION}" + CT_ExtractPatch LTRACE } do_debug_ltrace_build() { @@ -22,7 +14,7 @@ do_debug_ltrace_build() { CT_DoStep INFO "Installing ltrace" CT_DoLog EXTRA "Copying sources to build dir" - CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/ltrace-${CT_LTRACE_VERSION}/." \ + CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/ltrace/." \ "${CT_BUILD_DIR}/build-ltrace" CT_Pushd "${CT_BUILD_DIR}/build-ltrace" @@ -63,4 +55,3 @@ do_debug_ltrace_build() { CT_Popd CT_EndStep } - diff --git a/scripts/build/debug/500-strace.sh b/scripts/build/debug/500-strace.sh index 6eb23579..cb4643af 100644 --- a/scripts/build/debug/500-strace.sh +++ b/scripts/build/debug/500-strace.sh @@ -1,15 +1,11 @@ # Build script for strace do_debug_strace_get() { - local base_url="http://downloads.sourceforge.net/project/strace/strace" - CT_GetFile "strace-${CT_STRACE_VERSION}" "${base_url}/${CT_STRACE_VERSION}" - # Downloading from sourceforge leaves garbage, cleanup - CT_DoExecLog ALL rm -f "${CT_TARBALLS_DIR}/showfiles.php"* + CT_Fetch STRACE } do_debug_strace_extract() { - CT_Extract "strace-${CT_STRACE_VERSION}" - CT_Patch "strace" "${CT_STRACE_VERSION}" + CT_ExtractPatch STRACE } do_debug_strace_build() { @@ -23,7 +19,7 @@ do_debug_strace_build() { CPP="${CT_TARGET}-cpp" \ LD="${CT_TARGET}-ld" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/strace-${CT_STRACE_VERSION}/configure" \ + "${CT_SRC_DIR}/strace/configure" \ --build=${CT_BUILD} \ --host=${CT_TARGET} \ --prefix=/usr diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh index db9b1fde..07029d0a 100644 --- a/scripts/build/internals.sh +++ b/scripts/build/internals.sh @@ -70,17 +70,18 @@ do_finish() { "${CT_TARGET}/debug-root/usr/bin/gdbserver${exe_suffix}" fi if [ "${CT_CC_gcc}" = "y" ]; then - # We can not use the version in CT_CC_GCC_VERSION because + # TBD GCC 3.x/2.x is no longer supported by ctng + # We can not use the version in CT_GCC_VERSION because # of the Linaro stuff. So, harvest the version string # directly from the gcc sources... # All gcc 4.x seem to have the version in gcc/BASE-VER # while version prior to 4.x have the version in gcc/version.c # Of course, here is not the better place to do that... - if [ -f "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/BASE-VER" ]; then - gcc_version=$( cat "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/BASE-VER" ) + if [ -f "${CT_SRC_DIR}/gcc/gcc/BASE-VER" ]; then + gcc_version=$( cat "${CT_SRC_DIR}/gcc/gcc/BASE-VER" ) else gcc_version=$(sed -r -e '/version_string/!d; s/^.+= "([^"]+)".*$/\1/;' \ - "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/version.c" \ + "${CT_SRC_DIR}/gcc/gcc/version.c" \ ) fi for _t in "bin/${CT_TARGET}-"* \ diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh index cd4a4566..0f04d64e 100644 --- a/scripts/build/kernel/linux.sh +++ b/scripts/build/kernel/linux.sh @@ -19,58 +19,12 @@ CT_DoKernelTupleValues() { # Download the kernel do_kernel_get() { - local k_ver - local custom_name - local rel_dir - local korg_base mirror_base - - if [ "${CT_KERNEL_LINUX_CUSTOM}" = "y" ]; then - CT_GetCustom "linux" "${CT_KERNEL_LINUX_CUSTOM_VERSION}" \ - "${CT_KERNEL_LINUX_CUSTOM_LOCATION}" - else # Not a custom tarball - case "${CT_KERNEL_VERSION}" in - 2.6.*.*|3.*.*|4.*.*) - # 4-part versions (for 2.6 stables and long-terms), and - # 3-part versions (for 3.x.y and 4.x.y stables and long-terms) - # we need to trash the last digit - k_ver="${CT_KERNEL_VERSION%.*}" - ;; - 2.6.*|3.*|4.*) - # 3-part version (for 2.6.x initial releases), and 2-part - # versions (for 3.x and 4.x initial releases), use all of it - k_ver="${CT_KERNEL_VERSION}" - ;; - esac - case "${CT_KERNEL_VERSION}" in - 2.6.*) rel_dir=v2.6;; - 3.*) rel_dir=v3.x;; - 4.*) rel_dir=v4.x;; - esac - korg_base="http://www.kernel.org/pub/linux/kernel/${rel_dir}" - CT_GetFile "linux-${CT_KERNEL_VERSION}" \ - "${korg_base}" \ - "${korg_base}/longterm/v${k_ver}" \ - "${korg_base}/longterm" - fi + CT_Fetch LINUX } # Extract kernel do_kernel_extract() { - # If using a custom directory location, nothing to do - if [ "${CT_KERNEL_LINUX_CUSTOM}" = "y" \ - -a -d "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}" ]; then - return 0 - fi - - # Otherwise, we're using either a mainstream tarball, or a custom - # tarball; in either case, we need to extract - CT_Extract "linux-${CT_KERNEL_VERSION}" - - # If using a custom tarball, no need to patch - if [ "${CT_KERNEL_LINUX_CUSTOM}" = "y" ]; then - return 0 - fi - CT_Patch "linux" "${CT_KERNEL_VERSION}" + CT_ExtractPatch LINUX # Disable building relocs application - it needs # on the host, which may not be present on Cygwin or MacOS; it @@ -79,7 +33,8 @@ do_kernel_extract() { # This is not done as a patch, since it varies from Linux version # to version - patching each particular Linux version would be # too cumbersome. - CT_Pushd "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}" + # TBD should happen before marking the sources as "patched"? + CT_Pushd "${CT_SRC_DIR}/linux" sed -i -r 's/(\$\(MAKE\) .* relocs)$/:/' arch/*/Makefile CT_Popd } @@ -93,7 +48,7 @@ do_kernel_headers() { mkdir -p "${CT_BUILD_DIR}/build-kernel-headers" - kernel_path="${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}" + kernel_path="${CT_SRC_DIR}/linux" V_OPT="V=${CT_KERNEL_LINUX_VERBOSE_LEVEL}" kernel_arch="${CT_ARCH}" diff --git a/scripts/build/libc/avr-libc.sh b/scripts/build/libc/avr-libc.sh index f94b6017..7003f387 100644 --- a/scripts/build/libc/avr-libc.sh +++ b/scripts/build/libc/avr-libc.sh @@ -1,33 +1,11 @@ # This file adds functions to build the avr-libc C library do_libc_get() { - local libc_src - - libc_src="http://download.savannah.gnu.org/releases/avr-libc" - - if [ "${CT_LIBC_AVR_LIBC_CUSTOM}" = "y" ]; then - CT_GetCustom "avr-libc" "${CT_LIBC_AVR_LIBC_CUSTOM_VERSION}" \ - "${CT_LIBC_AVR_LIBC_CUSTOM_LOCATION}" - else # ! custom location - CT_GetFile "avr-libc-${CT_LIBC_VERSION}" "${libc_src}" - fi # ! custom location + CT_Fetch AVR_LIBC } do_libc_extract() { - CT_Extract "avr-libc-${CT_LIBC_VERSION}" - CT_Patch "avr-libc" "${CT_LIBC_VERSION}" -} - -do_libc_configure() { - CT_DoLog EXTRA "Configuring C library" - - CT_DoExecLog CFG \ - ${CONFIG_SHELL} \ - ./configure \ - --build=${CT_BUILD} \ - --host=${CT_TARGET} \ - --prefix=${CT_PREFIX_DIR} \ - "${CT_LIBC_AVR_LIBC_EXTRA_CONFIG_ARRAY[@]}" + CT_ExtractPatch AVR_LIBC } do_libc_start_files() { @@ -42,11 +20,19 @@ do_libc_post_cc() { CT_DoStep INFO "Installing C library" CT_DoLog EXTRA "Copying sources to build directory" - CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/avr-libc-${CT_LIBC_VERSION}/." \ + CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/avr-libc/." \ "${CT_BUILD_DIR}/build-libc-post-cc" cd "${CT_BUILD_DIR}/build-libc-post-cc" - do_libc_configure + CT_DoLog EXTRA "Configuring C library" + + CT_DoExecLog CFG \ + ${CONFIG_SHELL} \ + ./configure \ + --build=${CT_BUILD} \ + --host=${CT_TARGET} \ + --prefix=${CT_PREFIX_DIR} \ + "${CT_LIBC_AVR_LIBC_EXTRA_CONFIG_ARRAY[@]}" CT_DoLog EXTRA "Building C library" CT_DoExecLog ALL make ${JOBSFLAGS} diff --git a/scripts/build/libc/bionic.sh b/scripts/build/libc/bionic.sh index 4ce5d8f8..a52078d0 100644 --- a/scripts/build/libc/bionic.sh +++ b/scripts/build/libc/bionic.sh @@ -3,25 +3,17 @@ # Licensed under the GPL v2. See COPYING in the root of this package do_libc_get() { - if [ "${CT_LIBC_BIONIC_CUSTOM}" = "y" ]; then - CT_GetCustom "bionic" "${CT_LIBC_BIONIC_CUSTOM_VERSION}" \ - "${CT_LIBC_BIONIC_CUSTOM_LOCATION}" - else # ! custom location - CT_GetFile "android-ndk-${CT_LIBC_VERSION}-linux-x86_64.zip" https://dl.google.com/android/repository - fi # ! custom location + CT_Fetch BIONIC } do_libc_extract() { - CT_Extract "android-ndk-${CT_LIBC_VERSION}-linux-x86_64" - CT_Pushd "${CT_SRC_DIR}/android-ndk-${CT_LIBC_VERSION}/" - CT_Patch nochdir bionic "${CT_LIBC_VERSION}" - CT_Popd + CT_ExtractPatch BIONIC } # Install Unified headers do_libc_start_files() { CT_DoStep INFO "Installing C library headers" - CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/android-ndk-${CT_LIBC_VERSION}/sysroot/usr" "${CT_SYSROOT_DIR}" + CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/bionic/sysroot/usr" "${CT_SYSROOT_DIR}" } do_libc() { @@ -33,7 +25,7 @@ do_libc() { arch="${arch}64" fi CT_DoStep INFO "Installing C library binaries" - CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/android-ndk-${CT_LIBC_VERSION}/platforms/android-${CT_ANDROID_API}/arch-${arch}/usr" "${CT_SYSROOT_DIR}" + CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/bionic/platforms/android-${CT_ANDROID_API}/arch-${arch}/usr" "${CT_SYSROOT_DIR}" CT_EnvModify CT_TARGET_CFLAGS "${CT_TARGET_CFLAGS} -D__ANDROID_API__=${CT_ANDROID_API}" } diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh index e8f04458..5862759a 100644 --- a/scripts/build/libc/glibc.sh +++ b/scripts/build/libc/glibc.sh @@ -7,102 +7,22 @@ do_libc_get() { local version local -a addons_list - addons_list=($(do_libc_add_ons_list " ")) - - # Main source - if [ "${CT_GLIBC_CUSTOM}" = "y" ]; then - CT_GetCustom "glibc" "${CT_GLIBC_CUSTOM_VERSION}" \ - "${CT_GLIBC_CUSTOM_LOCATION}" - else - case "${CT_LIBC_VERSION}" in - linaro-*) - CT_GetLinaro "glibc" "${CT_LIBC_VERSION}" - ;; - *) - CT_GetFile "glibc-${CT_LIBC_VERSION}" \ - {http,ftp,https}://ftp.gnu.org/gnu/glibc \ - ftp://{sourceware.org,gcc.gnu.org}/pub/glibc/{releases,snapshots} - ;; - esac + CT_Fetch GLIBC + if [ "${CT_GLIBC_USE_PORTS_EXTERNAL}" = "y" ]; then + CT_Fetch GLIBC_PORTS fi - - # C library addons - for addon in "${addons_list[@]}"; do - # Never ever try to download these add-ons, - # they've always been internal - case "${addon}" in - nptl) continue;; - esac - - case "${addon}:${CT_GLIBC_PORTS_EXTERNAL}" in - ports:y) ;; - ports:*) continue;; - esac - - if ! CT_GetFile "glibc-${addon}-${CT_LIBC_VERSION}" \ - http://mirrors.kernel.org/sourceware/glibc \ - {http,ftp,https}://ftp.gnu.org/gnu/glibc \ - ftp://{sourceware.org,gcc.gnu.org}/pub/glibc/{releases,snapshots} - then - # Some add-ons are bundled with glibc, others are - # bundled in their own tarball. Eg. NPTL is internal, - # while LinuxThreads was external. Also, for old - # versions of glibc, the libidn add-on was external, - # but with version >=2.10, it is internal. - CT_DoLog DEBUG "Addon '${addon}' could not be downloaded." - CT_DoLog DEBUG "We'll see later if we can find it in the source tree" - fi - done - return 0 } do_libc_extract() { local addon - CT_Extract "${CT_LIBC}-${CT_LIBC_VERSION}" - CT_Pushd "${CT_SRC_DIR}/${CT_LIBC}-${CT_LIBC_VERSION}" - # Custom glibc won't get patched, because CT_GetCustom - # marks custom glibc as patched. - CT_Patch nochdir "${CT_LIBC}" "${CT_LIBC_VERSION}" - - for addon in $(do_libc_add_ons_list " "); do - # If the addon was bundled with the main archive, we do not - # need to extract it. Worse, if we were to try to extract - # it, we'd get an error. - if [ -d "${addon}" ]; then - CT_DoLog DEBUG "Add-on '${addon}' already present, skipping extraction" - continue - fi - - CT_Extract nochdir "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" - - CT_TestAndAbort "Error in add-on '${addon}': both short and long names in tarball" \ - -d "${addon}" -a -d "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" - - # Some addons have the 'long' name, while others have the - # 'short' name, but patches are non-uniformly built with - # either the 'long' or 'short' name, whatever the addons name - # but we prefer the 'short' name and avoid duplicates. - if [ -d "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" ]; then - CT_DoExecLog FILE mv "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" "${addon}" - fi - - CT_DoExecLog FILE ln -s "${addon}" "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" - - CT_Patch nochdir "${CT_LIBC}" "${addon}-${CT_LIBC_VERSION}" - - # Remove the long name since it can confuse configure scripts to run - # the same source twice. - rm "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" - done - - # The configure files may be older than the configure.in files - # if using a snapshot (or even some tarballs). Fake them being - # up to date. - find . -type f -name configure -exec touch {} \; 2>&1 |CT_DoLog ALL - - CT_Popd + CT_ExtrachPatch GLIBC + if [ "${CT_GLIBC_USE_PORTS_EXTERNAL}" = "y" ]; then + CT_Fetch GLIBC_PORTS + fi + # TBD make patches for addons (ports? anything else?) uniformly using short names + # TBD make the configure timestamp fix in all patched packages (e.g. part of CT_ExtractPatch) } # Build and install headers and start files @@ -161,7 +81,7 @@ do_libc_backend_once() { local multi_flags multi_dir multi_os_dir multi_root multi_index multi_count multi_target local build_cflags build_cppflags build_ldflags local startfiles_dir - local src_dir="${CT_SRC_DIR}/${CT_LIBC}-${CT_LIBC_VERSION}" + local src_dir="${CT_SRC_DIR}/glibc" local -a extra_config local -a extra_make_args local glibc_cflags @@ -390,7 +310,7 @@ do_libc_backend_once() { # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html mkdir -p "${CT_HEADERS_DIR}/gnu" CT_DoExecLog ALL touch "${CT_HEADERS_DIR}/gnu/stubs.h" - CT_DoExecLog ALL cp -v "${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}/include/features.h" \ + CT_DoExecLog ALL cp -v "${CT_SRC_DIR}/glibc/include/features.h" \ "${CT_HEADERS_DIR}/features.h" # Building the bootstrap gcc requires either setting inhibit_libc, or @@ -486,18 +406,18 @@ do_libc_backend_once() { # Build up the addons list, separated with $1 do_libc_add_ons_list() { local sep="$1" - local addons_list="$( echo "${CT_GLIBC_ADDONS_LIST}" \ - |sed -r -e "s/[[:space:],]/${sep}/g;" \ - )" - if [ "${GLIBC_HAS_NPTL_ADDON}" = "y" ]; then - case "${CT_THREADS}" in - none) ;; - *) addons_list="${addons_list}${sep}${CT_THREADS}";; - esac + local addons_list + + if [ "${CT_GLIBC_USE_PORTS_ADDON}" = "y" ]; then + addons_list="${addons_list}${sep}ports" fi - [ "${CT_GLIBC_USE_PORTS}" = "y" ] && addons_list="${addons_list}${sep}ports" - # Remove duplicate, leading and trailing separators - echo "${addons_list}" |sed -r -e "s/${sep}+/${sep}/g; s/^${sep}//; s/${sep}\$//;" + if [ "${CT_GLIBC_USE_NPTL_ADDON}" = "y" ]; then + addons_list="${addons_list}${sep}nptl" + fi + if [ "${CT_GLIBC_USE_LIBIDN_ADDON}" = "y" ]; then + addons_list="${addons_list}${sep}libidn" + fi + echo "${addons_list#${sep}}" # Remove leading separator if any } # Compute up the minimum supported Linux kernel version @@ -507,6 +427,7 @@ do_libc_min_kernel_config() { case "${CT_GLIBC_EXTRA_CONFIG_ARRAY[*]}" in *--enable-kernel*) ;; *) if [ "${CT_GLIBC_KERNEL_VERSION_AS_HEADERS}" = "y" ]; then + # TBD do we support that currently? We always seem to install kernel headers # We can't rely on the kernel version from the configuration, # because it might not be available if the user uses pre-installed # headers. On the other hand, both method will have the kernel @@ -536,7 +457,7 @@ do_libc_min_kernel_config() { # Build and install the libc locales do_libc_locales() { - local src_dir="${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}" + local src_dir="${CT_SRC_DIR}/glibc" local -a extra_config local glibc_cflags diff --git a/scripts/build/libc/mingw.sh b/scripts/build/libc/mingw.sh index 1471785d..295b313b 100644 --- a/scripts/build/libc/mingw.sh +++ b/scripts/build/libc/mingw.sh @@ -1,29 +1,17 @@ # Copyright 2012 Yann Diorcet # Licensed under the GPL v2. See COPYING in the root of this package -CT_WINAPI_VERSION_DOWNLOADED= - do_libc_get() { - if [ "${CT_WINAPI_VERSION}" = "devel" ]; then - CT_GetGit "mingw-w64" "ref=HEAD" "git://git.code.sf.net/p/mingw-w64/mingw-w64" CT_WINAPI_VERSION_DOWNLOADED - CT_DoLog DEBUG "Fetched mingw-w64 as ${CT_WINAPI_VERSION_DOWNLOADED}" - else - CT_GetFile "mingw-w64-v${CT_WINAPI_VERSION}" \ - http://downloads.sourceforge.net/sourceforge/mingw-w64 - CT_WINAPI_VERSION_DOWNLOADED=v${CT_WINAPI_VERSION} - fi + CT_Fetch MINGW_W64 } do_libc_extract() { - CT_Extract "mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}" - CT_Pushd "${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/" - CT_Patch nochdir mingw-w64 "${CT_WINAPI_VERSION_DOWNLOADED}" - CT_Popd + CT_ExtractPatch MINGW_W64 } do_set_mingw_install_prefix(){ MINGW_INSTALL_PREFIX=/usr/${CT_TARGET} - if [[ ${CT_WINAPI_VERSION} == 2* ]]; then + if [[ ${CT_MINGW_W64_VERSION} == 2* ]]; then MINGW_INSTALL_PREFIX=/usr fi } @@ -51,7 +39,7 @@ do_libc_start_files() { do_set_mingw_install_prefix CT_DoExecLog CFG \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-headers/configure" \ + "${CT_SRC_DIR}/mingw-w64/mingw-w64-headers/configure" \ --build=${CT_BUILD} \ --host=${CT_TARGET} \ --prefix=${MINGW_INSTALL_PREFIX} \ @@ -75,9 +63,9 @@ do_libc_start_files() { do_check_mingw_vendor_tuple() { - if [[ ${CT_WINAPI_VERSION} == 4* ]]; then - CT_DoStep INFO "Checking vendor tuple configured in crosstool-ng .config" - if [[ ${CT_TARGET_VENDOR} == w64 ]]; then + if [ "${CT_MINGW_W64_VERSION%%.*}" -ge 4 ]; then + CT_DoStep INFO "Checking configured vendor tuple" + if [ ${CT_TARGET_VENDOR} == w64 ]; then CT_DoLog EXTRA "The tuple is set to '${CT_TARGET_VENDOR}', as recommended by mingw-64 developers." else CT_DoLog WARN "The tuple vendor is '${CT_TARGET_VENDOR}', not equal to 'w64' and might break the toolchain!" @@ -92,7 +80,7 @@ do_mingw_tools() for f in "${CT_MINGW_TOOL_LIST_ARRAY[@]}"; do CT_mkdir_pushd "${f}" - if [ ! -d "${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-tools/${f}" ]; then + if [ ! -d "${CT_SRC_DIR}/mingw-w64/mingw-w64-tools/${f}" ]; then CT_DoLog WARN "Skipping ${f}: not found" CT_Popd continue @@ -101,7 +89,7 @@ do_mingw_tools() CT_DoLog EXTRA "Configuring ${f}" CT_DoExecLog CFG \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-tools/${f}/configure" \ + "${CT_SRC_DIR}/mingw-w64/mingw-w64-tools/${f}/configure" \ --build=${CT_BUILD} \ --host=${CT_HOST} \ --target=${CT_TARGET} \ @@ -159,7 +147,7 @@ do_mingw_pthreads() RCFLAGS="${rcflags}" \ DLLTOOLFLAGS="${dlltoolflags}" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-libraries/winpthreads/configure" \ + "${CT_SRC_DIR}/mingw-w64/mingw-w64-libraries/winpthreads/configure" \ --with-sysroot=${CT_SYSROOT_DIR} \ --prefix=${MINGW_INSTALL_PREFIX} \ --libdir=${libprefix} \ @@ -189,7 +177,7 @@ do_libc() do_set_mingw_install_prefix CT_DoExecLog CFG \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/mingw-w64-${CT_WINAPI_VERSION_DOWNLOADED}/mingw-w64-crt/configure" \ + "${CT_SRC_DIR}/mingw-w64/mingw-w64-crt/configure" \ --with-sysroot=${CT_SYSROOT_DIR} \ --prefix=${MINGW_INSTALL_PREFIX} \ --build=${CT_BUILD} \ diff --git a/scripts/build/libc/musl.sh b/scripts/build/libc/musl.sh index 5a53fd0a..430fb8da 100644 --- a/scripts/build/libc/musl.sh +++ b/scripts/build/libc/musl.sh @@ -3,17 +3,11 @@ # Licensed under the GPL v2. See COPYING in the root of this package do_libc_get() { - if [ "${CT_LIBC_MUSL_CUSTOM}" = "y" ]; then - CT_GetCustom "musl" "${CT_LIBC_MUSL_CUSTOM_VERSION}" \ - "${CT_LIBC_MUSL_CUSTOM_LOCATION}" - else # ! custom location - CT_GetFile "musl-${CT_LIBC_VERSION}" http://www.musl-libc.org/releases - fi # ! custom location + CT_Fetch MUSL } do_libc_extract() { - CT_Extract "musl-${CT_LIBC_VERSION}" - CT_Patch "musl" "${CT_LIBC_VERSION}" + CT_ExtractPatch MUSL } # Build and install headers and start files @@ -62,7 +56,7 @@ do_libc_backend_once() { local libc_mode local -a extra_cflags local -a extra_config - local src_dir="${CT_SRC_DIR}/${CT_LIBC}-${CT_LIBC_VERSION}" + local src_dir="${CT_SRC_DIR}/musl" local multi_dir multi_os_dir multi_root multi_flags multi_index multi_count local multilib_dir local hdr_install_subdir @@ -83,7 +77,7 @@ do_libc_backend_once() { # From buildroot: # gcc constant folding bug with weak aliases workaround # See http://www.openwall.com/lists/musl/2014/05/15/1 - if [ "${CT_CC_GCC_4_9_or_later}" = "y" ]; then + if [ "${CT_GCC_BUG_61144}" = "y" ]; then extra_cflags+=("-fno-toplevel-reorder") fi diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh index 3b485078..ff0f45b5 100644 --- a/scripts/build/libc/newlib.sh +++ b/scripts/build/libc/newlib.sh @@ -6,44 +6,21 @@ # do_libc_get() { - local libc_src="{http://mirrors.kernel.org/sourceware/newlib, - ftp://sourceware.org/pub/newlib}" - - if [ "${CT_LIBC_NEWLIB_CUSTOM}" = "y" ]; then - CT_GetCustom "newlib" "${CT_LIBC_NEWLIB_CUSTOM_VERSION}" \ - "${CT_LIBC_NEWLIB_CUSTOM_LOCATION}" - else # ! custom location - case "${CT_LIBC_VERSION}" in - linaro-*) - CT_GetLinaro "newlib" "${CT_LIBC_VERSION}" - ;; - *) - # kernel.org mirror is outdated, keep last as a fallback - CT_GetFile "newlib-${CT_LIBC_VERSION}" \ - ftp://sourceware.org/pub/newlib \ - http://mirrors.kernel.org/sourceware/newlib \ - http://mirrors.kernel.org/sources.redhat.com/newlib - ;; - esac - fi # ! custom location + CT_Fetch NEWLIB } do_libc_extract() { - CT_Extract "newlib-${CT_LIBC_VERSION}" - CT_Patch "newlib" "${CT_LIBC_VERSION}" - - if [ -n "${CT_ARCH_XTENSA_CUSTOM_NAME}" ]; then - CT_ConfigureXtensa "newlib" "${CT_LIBC_VERSION}" - fi + # TBD xtensa overlays + CT_ExtractPatch NEWLIB } do_libc_start_files() { CT_DoStep INFO "Installing C library headers & start files" - CT_DoExecLog ALL cp -a "${CT_SRC_DIR}/newlib-${CT_LIBC_VERSION}/newlib/libc/include/." \ + CT_DoExecLog ALL cp -a "${CT_SRC_DIR}/newlib/newlib/libc/include/." \ "${CT_HEADERS_DIR}" if [ "${CT_ARCH_xtensa}" = "y" ]; then CT_DoLog EXTRA "Installing Xtensa headers" - CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/newlib-${CT_LIBC_VERSION}/newlib/libc/sys/xtensa/include/." \ + CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/newlib/newlib/libc/sys/xtensa/include/." \ "${CT_HEADERS_DIR}" fi CT_EndStep @@ -131,7 +108,7 @@ ENABLE_TARGET_OPTSPACE:target-optspace AR_FOR_TARGET="`which ${CT_TARGET}-gcc-ar`" \ RANLIB_FOR_TARGET="`which ${CT_TARGET}-gcc-ranlib`" \ ${CONFIG_SHELL} \ - "${CT_SRC_DIR}/newlib-${CT_LIBC_VERSION}/configure" \ + "${CT_SRC_DIR}/newlib/configure" \ --host=${CT_BUILD} \ --target=${CT_TARGET} \ --prefix=${CT_PREFIX_DIR} \ diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index a730a1dd..e428349a 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -7,48 +7,24 @@ uclibc_locales_version=030818 uclibc_locale_tarball="uClibc-locale-${uclibc_locales_version}" -if [ "${CT_LIBC_UCLIBC_NG}" = "y" ]; then +if [ "${CT_UCLIBC_NG_USE_UCLIBC_NG_ORG}" = "y" ]; then + # TBD make the name come from config/versions/uclibc.in uclibc_name="uClibc-ng" - libc_src="http://downloads.uclibc-ng.org/releases/${CT_LIBC_VERSION}" -else +elif [ "${CT_UCLIBC_NG_USE_UCLIBC_ORG}" = "y" ]; then uclibc_name="uClibc" - libc_src="http://www.uclibc.org/downloads - http://www.uclibc.org/downloads/old-releases" fi # Download uClibc do_libc_get() { - if [ "${CT_LIBC_UCLIBC_CUSTOM}" = "y" ]; then - CT_GetCustom "${uclibc_name}" "${CT_LIBC_UCLIBC_CUSTOM_VERSION}" \ - "${CT_LIBC_UCLIBC_CUSTOM_LOCATION}" - else - CT_GetFile "${uclibc_name}-${CT_LIBC_VERSION}" ${libc_src} - fi - # uClibc locales - if [ "${CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA}" = "y" ]; then - CT_GetFile "${uclibc_locale_tarball}" ${libc_src} - fi - - return 0 + # TBD allow for "default fork" selection in package.desc and select uClibc-NG (and then use just UCLIBC moniker) + CT_Fetch UCLIBC_NG + # TBD locales } # Extract uClibc do_libc_extract() { - CT_Extract "${uclibc_name}-${CT_LIBC_VERSION}" - CT_Patch "${uclibc_name}" "${CT_LIBC_VERSION}" - - # uClibc locales - # Extracting pregen locales ourselves is kinda - # broken, so just link it in place... - if [ "${CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA}" = "y" \ - -a ! -f "${CT_SRC_DIR}/.${uclibc_locale_tarball}.extracted" ]; then - CT_Pushd "${CT_SRC_DIR}/${uclibc_name}-${CT_LIBC_VERSION}/extra/locale" - CT_DoExecLog ALL ln -s "${CT_TARBALLS_DIR}/${uclibc_locale_tarball}.tgz" . - CT_Popd - touch "${CT_SRC_DIR}/.${uclibc_locale_tarball}.extracted" - fi - - return 0 + CT_ExtractPatch UCLIBC_NG + # TBD locales } # Build and install headers and start files @@ -102,7 +78,7 @@ do_libc_backend_once() { # Simply copy files until uClibc has the ability to build out-of-tree CT_DoLog EXTRA "Copying sources to build dir" - CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/${uclibc_name}-${CT_LIBC_VERSION}/." . + CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/${uclibc_name}/." . multilib_dir="lib/${multi_os_dir}" startfiles_dir="${multi_root}/usr/${multilib_dir}" diff --git a/scripts/build/test_suite/gcc.sh b/scripts/build/test_suite/gcc.sh index c829a438..6c6e5a72 100644 --- a/scripts/build/test_suite/gcc.sh +++ b/scripts/build/test_suite/gcc.sh @@ -18,7 +18,7 @@ do_test_suite_gcc_build() { CT_DoExecLog ALL cp -av "${CT_LIB_DIR}/contrib/gcc-test-suite/default.cfg" \ "${CT_LIB_DIR}/contrib/gcc-test-suite/Makefile" \ "${CT_LIB_DIR}/contrib/gcc-test-suite/README" \ - "${CT_SRC_DIR}/gcc-${CT_CC_GCC_VERSION}/gcc/testsuite" \ + "${CT_SRC_DIR}/gcc/gcc/testsuite" \ "${CT_TEST_SUITE_DIR}/gcc" CT_DoExecLog ALL sed -i -r -e "s/@@DG_TARGET@@/${CT_TARGET}/g;" \ diff --git a/scripts/functions b/scripts/functions index 972403f4..50802dd4 100644 --- a/scripts/functions +++ b/scripts/functions @@ -869,40 +869,6 @@ CT_GetFile() { return 1 } -# Get a component from Linaro archives. -# Usage: CT_GetLinaro -CT_GetLinaro() { - local comp="$1" - local version="$2" - local linaro_version - local yyyymm_p - local yymm - local base - - case "${version}" in - linaro-*) - linaro_version="${version#linaro-}" - ;; - *) - CT_Abort "Version ${version} is not a Linaro package" - ;; - esac - - # Recent releases reside in top of the directory tree; older releases - # are moved into the archive. Subdirectories are named differently - # in archive! - # In archive, some URLs also contain base component version - # (e.g. "gcc-linaro/4.9") while some do not (e.g. just "newlib-linaro"). - base="${linaro_version%%-*}" - # Strip base version, first two digits of the year and optional patchlevel - yymm="${linaro_version#*-??}" - yymm="${yymm%-*}" - CT_GetFile "${comp}-${version}" \ - "https://releases.linaro.org/components/toolchain/${comp}-linaro/${linaro_version}" \ - "https://releases.linaro.org/archive/${yymm}/components/toolchain/${comp}-linaro/${base}" \ - "https://releases.linaro.org/archive/${yymm}/components/toolchain/${comp}-linaro" -} - # Checkout from CVS, and build the associated tarball # The tarball will be called ${basename}.tar.bz2 # Prerequisite: either the server does not require password, @@ -1914,3 +1880,59 @@ CT_MultilibFixupLDSO() CT_Popd CT_EndStep } + +# List the download mirrors. Usage: +# CT_Mirrors ORGANIZATION PROJECT +CT_Mirrors() +{ + local org="${1}" + local project="${2}" + + case "${org}" in + GNU) + echo "https://ftpmirror.gnu.org/gnu/${project}" + echo "http://ftpmirror.gnu.org/gnu/${project}" + echo "https://ftp.gnu.org/gnu/${project}" + echo "http://ftp.gnu.org/gnu/${project}" + echo "ftp://ftp.gnu.org/gnu/${project}" + ;; + sourceware) + local subdir="${3:+/${3}}" + echo "ftp://sourceware.org/pub/${project}/releases${subdir}" + echo "http://mirrors.kernel.org/sourceware/${project}/releases${subdir}" + echo "http://gcc.gnu.org/pub/${project}/releases${subdir}" + ;; + Linaro) + local version="${3}" + base yymm + base="${version%%-*}" + yymm="${version##*-??}" + echo "https://releases.linaro.org/components/toolchain/${comp}-linaro/${version}" + echo "https://releases.linaro.org/archive/${yymm}/components/toolchain/${comp}-linaro/${base}" + echo "https://releases.linaro.org/archive/${yymm}/components/toolchain/${comp}-linaro" + ;; + linux) + local version="${3}" + case "${version}" in + [34].*) + echo "http://www.kernel.org/pub/linux/kernel/v${version%%.*}.x" + ;; + 2.6.*) + echo "http://www.kernel.org/pub/linux/kernel/v2.6" + case "${version}" in + 2.6.*.*) + echo "http://www.kernel.org/pub/linux/kernel/v2.6/longterm" + echo "http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v${version%.*}" + ;; + esac + ;; + *) + CT_Abort "Unsupported Linux kernel version" + ;; + esac + ;; + *) + CT_Abort "Unknown mirror '${org}'" + ;; + esac +} diff --git a/scripts/saveSample.sh.in b/scripts/saveSample.sh.in index d9d999c9..2c666dba 100644 --- a/scripts/saveSample.sh.in +++ b/scripts/saveSample.sh.in @@ -72,8 +72,8 @@ fi # Save the uClibc .config file if [ -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then # We save the file, and then point the saved sample to this file - CT_DoAddFileToSample "${CT_LIBC_UCLIBC_CONFIG_FILE}" "${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config" - "${sed}" -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE)=.+$|\1="'"${samp_top_dir}"'/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"|;' \ + CT_DoAddFileToSample "${CT_LIBC_UCLIBC_CONFIG_FILE}" "${samp_dir}/${CT_LIBC}-${CT_UCLIBC_NG_VERSION}.config" + "${sed}" -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE)=.+$|\1="'"${samp_top_dir}"'/samples/${CT_TARGET}/${CT_LIBC}-${CT_UCLIBC_NG_VERSION}.config"|;' \ .defconfig else # remove any dangling files diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh index 1e5d50bd..b11a8d6b 100644 --- a/scripts/showSamples.sh +++ b/scripts/showSamples.sh @@ -20,16 +20,30 @@ dump_single_sample() { [ "$1" = "-v" ] && verbose=1 && shift [ "$1" = "-w" ] && wiki=1 && shift local sample="$1" + # TBD use CT_LoadConfig . $(pwd)/.config.sample # libc needs some love + # TBD after conversion of gen-kconfig to template, use CT_LIBC_USE as a selector for other variables + # (i.e. whether to use CT_GLIBC_VERSION or CT_MUSL_VERSION) local libc_name="${CT_LIBC}" - local libc_ver="${CT_LIBC_VERSION}" - if [ "${CT_LIBC}" = "uClibc" -a "${CT_LIBC_UCLIBC_NG}" = "y" ]; then - libc_name="uClibc-ng" - elif [ "${CT_LIBC}" = "mingw" ]; then - libc_ver="${CT_WINAPI_VERSION}" - fi + local libc_ver ksym + + ksym=${libc_name//[^0-9A-Za-z_]/_} + ksym=${ksym^^} + case ${ksym} in + GLIBC|NEWLIB) + if eval "[ \"\${CT_${ksym}_USE_LINARO}\" = y ]"; then + ksym="${ksym}_LINARO" + fi + ;; + UCLIBC) + if [ "${UCLIBC_NG_USE_UCLIBC_NG_ORG}" = y ]; then + ksym="${ksym}_NG" + fi + ;; + esac + eval "libc_ver=\"\${CT_${ksym}_VERSION}\"" case "${sample}" in current) @@ -63,7 +77,8 @@ dump_single_sample() { printf " %-*s : %s\n" ${width} "Host" "${CT_HOST}" ;; esac - printf " %-*s : %s\n" ${width} "OS" "${CT_KERNEL}${CT_KERNEL_VERSION:+-}${CT_KERNEL_VERSION}" + # TBD currently only Linux is used. General handling for single-select (compiler/binutils/libc/os) and multi-select (debug/companions) components? + printf " %-*s : %s\n" ${width} "OS" "${CT_KERNEL}${CT_LINUX_VERSION:+-}${CT_LINUX_VERSION}" if [ -n "${CT_GMP}" \ -o -n "${CT_MPFR}" \ -o -n "${CT_ISL}" \ @@ -139,7 +154,7 @@ dump_single_sample() { if [ "${CT_KERNEL_LINUX_HEADERS_USE_CUSTOM_DIR}" = "y" ]; then printf " //custom// " else - printf " ${CT_KERNEL_VERSION} " + printf " ${CT_LINUX_VERSION} " fi fi printf "| ${CT_BINUTILS_VERSION} "