From aa725129e840e596bbbf43b80fed6194a0dfbc72 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 23 Mar 2009 17:56:28 +0000 Subject: [PATCH] clean up uclibc patch/config version handling a bit git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14994 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/uClibc/Makefile | 34 +++++-------------- .../{config/0.9.28.2 => config-0.9.28}/arm | 0 .../{config/0.9.28.2 => config-0.9.28}/armeb | 0 .../{config/0.9.28.2 => config-0.9.28}/avr32 | 0 .../{config/0.9.28.2 => config-0.9.28}/cris | 0 .../{config/0.9.28.2 => config-0.9.28}/i386 | 0 .../{config/0.9.28.2 => config-0.9.28}/mips | 0 .../{config/0.9.28.2 => config-0.9.28}/mipsel | 0 .../0.9.28.2 => config-0.9.28}/powerpc | 0 .../{config/0.9.28.2 => config-0.9.28}/x86_64 | 0 .../uClibc/{config => config-0.9.29}/arm | 0 .../{config => config-0.9.29}/arm.storm | 0 .../uClibc/{config => config-0.9.29}/armeb | 0 .../uClibc/{config => config-0.9.29}/avr32 | 0 .../uClibc/{config => config-0.9.29}/cris | 0 .../uClibc/{config => config-0.9.29}/i386 | 0 .../uClibc/{config => config-0.9.29}/i686 | 0 .../uClibc/{config => config-0.9.29}/mips | 0 .../uClibc/{config => config-0.9.29}/mipsel | 0 .../uClibc/{config => config-0.9.29}/powerpc | 0 .../uClibc/{config => config-0.9.29}/x86_64 | 0 .../{config/0.9.30 => config-0.9.30}/arm | 0 .../0.9.30 => config-0.9.30}/arm.storm | 0 .../{config/0.9.30 => config-0.9.30}/armeb | 0 .../{config/0.9.30 => config-0.9.30}/avr32 | 0 .../{config/0.9.30 => config-0.9.30}/cris | 0 .../{config/0.9.30 => config-0.9.30}/i386 | 0 .../{config/0.9.30 => config-0.9.30}/i686 | 0 .../{config/0.9.30 => config-0.9.30}/mips | 0 .../{config/0.9.30 => config-0.9.30}/mipsel | 0 .../{config/0.9.30 => config-0.9.30}/powerpc | 0 .../{config/0.9.30 => config-0.9.30}/x86_64 | 0 .../100-revert_broken_stuff.patch | 0 .../120-more_standard_math.patch | 0 .../150-portability.patch | 0 .../160-move_stack_end.patch | 0 ...-fix_kernel_types_with_recent_kernel.patch | 0 .../200-cris-syscall6.patch | 0 .../230-cris-pagesize.patch | 0 .../240-cris-crt0.patch | 0 .../250-cris-errno.patch | 0 ...ized-stringops-override-default-ones.patch | 0 .../301-fix-getrusage-argument-type.patch | 0 ...fix-__libc_fcntl64-varargs-prototype.patch | 0 ...3-fix-broken-__libc_open-declaration.patch | 0 .../400-avr32-arch-2.patch | 0 .../401-avr32-linkrelax-option.patch | 0 .../402-avr32-string-ops.patch | 0 .../403-no-create_module-on-avr32.patch | 0 .../407-ldso-avr32-2.patch | 0 .../409-ldso-avr32-startup-hack.patch | 0 .../410-ldd-avr32-support.patch | 0 .../411-libpthread-avr32.patch | 0 .../412-sync-fcntl-h-with-linux-kernel.patch | 0 .../001-fix_mmap.patch | 0 .../002-conditional_sched_affinity.patch | 0 .../004-fix_gethostent_r_failure_retval.patch | 0 ...005-fix_internal_function_definition.patch | 0 .../006-rm_whitespace.patch | 0 .../007-avr32.patch | 0 .../008-avr32_fix_sa_onstack.patch | 0 .../009-fix_getaddrinfo_infinite_loop.patch | 0 .../100-termios.patch | 0 .../110-compat_macros.patch | 0 .../120-adjtimex.patch | 0 .../130-compile_fixes.patch | 0 .../130-sockets_throw.patch | 0 .../131-arm_ftruncate64.patch | 0 .../132-arm_fix_alignment.patch | 0 .../133-unistd_arm.patch | 0 ...140-fix-endless-recursion-in-pthread.patch | 0 .../150-fix-ldso-text-realloc-segfault.patch | 0 .../160-mips_syscall.patch | 0 .../170-enable-getifaddrs.patch | 0 ...-fix_kernel_types_with_recent_kernel.patch | 0 .../190-install_tls.patch | 0 .../200-libpthread_fix.patch | 0 .../210-trunc.patch | 0 .../220-libpthread_sysdep_fixes.patch | 0 .../910-gcc_4_3_include_fixed.patch | 0 .../110-compat_macros.patch | 0 .../120-adjtimex.patch | 0 .../130-sockets_throw.patch | 0 ...-fix_kernel_types_with_recent_kernel.patch | 0 84 files changed, 8 insertions(+), 26 deletions(-) rename toolchain/uClibc/{config/0.9.28.2 => config-0.9.28}/arm (100%) rename toolchain/uClibc/{config/0.9.28.2 => config-0.9.28}/armeb (100%) rename toolchain/uClibc/{config/0.9.28.2 => config-0.9.28}/avr32 (100%) rename toolchain/uClibc/{config/0.9.28.2 => config-0.9.28}/cris (100%) rename toolchain/uClibc/{config/0.9.28.2 => config-0.9.28}/i386 (100%) rename toolchain/uClibc/{config/0.9.28.2 => config-0.9.28}/mips (100%) rename toolchain/uClibc/{config/0.9.28.2 => config-0.9.28}/mipsel (100%) rename toolchain/uClibc/{config/0.9.28.2 => config-0.9.28}/powerpc (100%) rename toolchain/uClibc/{config/0.9.28.2 => config-0.9.28}/x86_64 (100%) rename toolchain/uClibc/{config => config-0.9.29}/arm (100%) rename toolchain/uClibc/{config => config-0.9.29}/arm.storm (100%) rename toolchain/uClibc/{config => config-0.9.29}/armeb (100%) rename toolchain/uClibc/{config => config-0.9.29}/avr32 (100%) rename toolchain/uClibc/{config => config-0.9.29}/cris (100%) rename toolchain/uClibc/{config => config-0.9.29}/i386 (100%) rename toolchain/uClibc/{config => config-0.9.29}/i686 (100%) rename toolchain/uClibc/{config => config-0.9.29}/mips (100%) rename toolchain/uClibc/{config => config-0.9.29}/mipsel (100%) rename toolchain/uClibc/{config => config-0.9.29}/powerpc (100%) rename toolchain/uClibc/{config => config-0.9.29}/x86_64 (100%) rename toolchain/uClibc/{config/0.9.30 => config-0.9.30}/arm (100%) rename toolchain/uClibc/{config/0.9.30 => config-0.9.30}/arm.storm (100%) rename toolchain/uClibc/{config/0.9.30 => config-0.9.30}/armeb (100%) rename toolchain/uClibc/{config/0.9.30 => config-0.9.30}/avr32 (100%) rename toolchain/uClibc/{config/0.9.30 => config-0.9.30}/cris (100%) rename toolchain/uClibc/{config/0.9.30 => config-0.9.30}/i386 (100%) rename toolchain/uClibc/{config/0.9.30 => config-0.9.30}/i686 (100%) rename toolchain/uClibc/{config/0.9.30 => config-0.9.30}/mips (100%) rename toolchain/uClibc/{config/0.9.30 => config-0.9.30}/mipsel (100%) rename toolchain/uClibc/{config/0.9.30 => config-0.9.30}/powerpc (100%) rename toolchain/uClibc/{config/0.9.30 => config-0.9.30}/x86_64 (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/100-revert_broken_stuff.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/120-more_standard_math.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/150-portability.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/160-move_stack_end.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/180-fix_kernel_types_with_recent_kernel.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/200-cris-syscall6.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/230-cris-pagesize.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/240-cris-crt0.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/250-cris-errno.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/300-let-optimized-stringops-override-default-ones.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/301-fix-getrusage-argument-type.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/302-fix-__libc_fcntl64-varargs-prototype.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/303-fix-broken-__libc_open-declaration.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/400-avr32-arch-2.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/401-avr32-linkrelax-option.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/402-avr32-string-ops.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/403-no-create_module-on-avr32.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/407-ldso-avr32-2.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/409-ldso-avr32-startup-hack.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/410-ldd-avr32-support.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/411-libpthread-avr32.patch (100%) rename toolchain/uClibc/{patches/0.9.28.2 => patches-0.9.28}/412-sync-fcntl-h-with-linux-kernel.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/001-fix_mmap.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/002-conditional_sched_affinity.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/004-fix_gethostent_r_failure_retval.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/005-fix_internal_function_definition.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/006-rm_whitespace.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/007-avr32.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/008-avr32_fix_sa_onstack.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/009-fix_getaddrinfo_infinite_loop.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/100-termios.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/110-compat_macros.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/120-adjtimex.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/130-compile_fixes.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/130-sockets_throw.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/131-arm_ftruncate64.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/132-arm_fix_alignment.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/133-unistd_arm.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/140-fix-endless-recursion-in-pthread.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/150-fix-ldso-text-realloc-segfault.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/160-mips_syscall.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/170-enable-getifaddrs.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/180-fix_kernel_types_with_recent_kernel.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/190-install_tls.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/200-libpthread_fix.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/210-trunc.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/220-libpthread_sysdep_fixes.patch (100%) rename toolchain/uClibc/{patches => patches-0.9.29}/910-gcc_4_3_include_fixed.patch (100%) rename toolchain/uClibc/{patches/0.9.30 => patches-0.9.30}/110-compat_macros.patch (100%) rename toolchain/uClibc/{patches/0.9.30 => patches-0.9.30}/120-adjtimex.patch (100%) rename toolchain/uClibc/{patches/0.9.30 => patches-0.9.30}/130-sockets_throw.patch (100%) rename toolchain/uClibc/{patches/0.9.30 => patches-0.9.30}/180-fix_kernel_types_with_recent_kernel.patch (100%) diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 3de6bc887..308bca289 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -18,36 +18,18 @@ else PKG_SOURCE_URL:=http://www.uclibc.org/downloads PKG_SOURCE:=uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION).tar.bz2 endif -PATCH_DIR:=./patches/$(PKG_VERSION)$(PKG_EXTRAVERSION) -CONFIG_DIR:=./config/$(PKG_VERSION)$(PKG_EXTRAVERSION) +PATCH_DIR:=$(firstword $(wildcard ./patches-$(PKG_VERSION)$(PKG_EXTRAVERSION) ./patches-$(PKG_VERSION))) +CONFIG_DIR:=$(firstword $(wildcard ./config-$(PKG_VERSION)$(PKG_EXTRAVERSION) ./config-$(PKG_VERSION))) -ifeq ($(PKG_VERSION),0.9.28) - ifeq ($(PKG_EXTRAVERSION),.2) - PKG_MD5SUM:=959f25286e317f0d9e2103445c5a14c2 - endif - ifeq ($(PKG_EXTRAVERSION),.3) - PKG_MD5SUM:=428405a36b4662980d9343b32089b5a6 - endif -endif - -ifeq ($(PKG_VERSION),0.9.29) - ifeq ($(PKG_EXTRAVERSION),) - # currently the default version, no special sub-directory needed - PATCH_DIR:=./patches - CONFIG_DIR:=./config - PKG_MD5SUM:=61dc55f43b17a38a074f347e74095b20 - endif -endif - -ifeq ($(PKG_VERSION),0.9.30) - ifeq ($(PKG_EXTRAVERSION),) - PKG_MD5SUM:=e5766e2566e0297adebebbcc0aba1f2d - endif -endif +PKG_MD5SUM_0.9.28.2 = 959f25286e317f0d9e2103445c5a14c2 +PKG_MD5SUM_0.9.28.3 = 428405a36b4662980d9343b32089b5a6 +PKG_MD5SUM_0.9.29 = 61dc55f43b17a38a074f347e74095b20 +PKG_MD5SUM_0.9.30 = e5766e2566e0297adebebbcc0aba1f2d +PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION)$(PKG_EXTRAVERSION)) ifeq ($(PKG_VERSION_SNAPSHOT),y) PATCH_DIR:= - CONFIG_DIR:=./config + CONFIG_DIR:=./config-0.9.30 PKG_MD5SUM:= endif diff --git a/toolchain/uClibc/config/0.9.28.2/arm b/toolchain/uClibc/config-0.9.28/arm similarity index 100% rename from toolchain/uClibc/config/0.9.28.2/arm rename to toolchain/uClibc/config-0.9.28/arm diff --git a/toolchain/uClibc/config/0.9.28.2/armeb b/toolchain/uClibc/config-0.9.28/armeb similarity index 100% rename from toolchain/uClibc/config/0.9.28.2/armeb rename to toolchain/uClibc/config-0.9.28/armeb diff --git a/toolchain/uClibc/config/0.9.28.2/avr32 b/toolchain/uClibc/config-0.9.28/avr32 similarity index 100% rename from toolchain/uClibc/config/0.9.28.2/avr32 rename to toolchain/uClibc/config-0.9.28/avr32 diff --git a/toolchain/uClibc/config/0.9.28.2/cris b/toolchain/uClibc/config-0.9.28/cris similarity index 100% rename from toolchain/uClibc/config/0.9.28.2/cris rename to toolchain/uClibc/config-0.9.28/cris diff --git a/toolchain/uClibc/config/0.9.28.2/i386 b/toolchain/uClibc/config-0.9.28/i386 similarity index 100% rename from toolchain/uClibc/config/0.9.28.2/i386 rename to toolchain/uClibc/config-0.9.28/i386 diff --git a/toolchain/uClibc/config/0.9.28.2/mips b/toolchain/uClibc/config-0.9.28/mips similarity index 100% rename from toolchain/uClibc/config/0.9.28.2/mips rename to toolchain/uClibc/config-0.9.28/mips diff --git a/toolchain/uClibc/config/0.9.28.2/mipsel b/toolchain/uClibc/config-0.9.28/mipsel similarity index 100% rename from toolchain/uClibc/config/0.9.28.2/mipsel rename to toolchain/uClibc/config-0.9.28/mipsel diff --git a/toolchain/uClibc/config/0.9.28.2/powerpc b/toolchain/uClibc/config-0.9.28/powerpc similarity index 100% rename from toolchain/uClibc/config/0.9.28.2/powerpc rename to toolchain/uClibc/config-0.9.28/powerpc diff --git a/toolchain/uClibc/config/0.9.28.2/x86_64 b/toolchain/uClibc/config-0.9.28/x86_64 similarity index 100% rename from toolchain/uClibc/config/0.9.28.2/x86_64 rename to toolchain/uClibc/config-0.9.28/x86_64 diff --git a/toolchain/uClibc/config/arm b/toolchain/uClibc/config-0.9.29/arm similarity index 100% rename from toolchain/uClibc/config/arm rename to toolchain/uClibc/config-0.9.29/arm diff --git a/toolchain/uClibc/config/arm.storm b/toolchain/uClibc/config-0.9.29/arm.storm similarity index 100% rename from toolchain/uClibc/config/arm.storm rename to toolchain/uClibc/config-0.9.29/arm.storm diff --git a/toolchain/uClibc/config/armeb b/toolchain/uClibc/config-0.9.29/armeb similarity index 100% rename from toolchain/uClibc/config/armeb rename to toolchain/uClibc/config-0.9.29/armeb diff --git a/toolchain/uClibc/config/avr32 b/toolchain/uClibc/config-0.9.29/avr32 similarity index 100% rename from toolchain/uClibc/config/avr32 rename to toolchain/uClibc/config-0.9.29/avr32 diff --git a/toolchain/uClibc/config/cris b/toolchain/uClibc/config-0.9.29/cris similarity index 100% rename from toolchain/uClibc/config/cris rename to toolchain/uClibc/config-0.9.29/cris diff --git a/toolchain/uClibc/config/i386 b/toolchain/uClibc/config-0.9.29/i386 similarity index 100% rename from toolchain/uClibc/config/i386 rename to toolchain/uClibc/config-0.9.29/i386 diff --git a/toolchain/uClibc/config/i686 b/toolchain/uClibc/config-0.9.29/i686 similarity index 100% rename from toolchain/uClibc/config/i686 rename to toolchain/uClibc/config-0.9.29/i686 diff --git a/toolchain/uClibc/config/mips b/toolchain/uClibc/config-0.9.29/mips similarity index 100% rename from toolchain/uClibc/config/mips rename to toolchain/uClibc/config-0.9.29/mips diff --git a/toolchain/uClibc/config/mipsel b/toolchain/uClibc/config-0.9.29/mipsel similarity index 100% rename from toolchain/uClibc/config/mipsel rename to toolchain/uClibc/config-0.9.29/mipsel diff --git a/toolchain/uClibc/config/powerpc b/toolchain/uClibc/config-0.9.29/powerpc similarity index 100% rename from toolchain/uClibc/config/powerpc rename to toolchain/uClibc/config-0.9.29/powerpc diff --git a/toolchain/uClibc/config/x86_64 b/toolchain/uClibc/config-0.9.29/x86_64 similarity index 100% rename from toolchain/uClibc/config/x86_64 rename to toolchain/uClibc/config-0.9.29/x86_64 diff --git a/toolchain/uClibc/config/0.9.30/arm b/toolchain/uClibc/config-0.9.30/arm similarity index 100% rename from toolchain/uClibc/config/0.9.30/arm rename to toolchain/uClibc/config-0.9.30/arm diff --git a/toolchain/uClibc/config/0.9.30/arm.storm b/toolchain/uClibc/config-0.9.30/arm.storm similarity index 100% rename from toolchain/uClibc/config/0.9.30/arm.storm rename to toolchain/uClibc/config-0.9.30/arm.storm diff --git a/toolchain/uClibc/config/0.9.30/armeb b/toolchain/uClibc/config-0.9.30/armeb similarity index 100% rename from toolchain/uClibc/config/0.9.30/armeb rename to toolchain/uClibc/config-0.9.30/armeb diff --git a/toolchain/uClibc/config/0.9.30/avr32 b/toolchain/uClibc/config-0.9.30/avr32 similarity index 100% rename from toolchain/uClibc/config/0.9.30/avr32 rename to toolchain/uClibc/config-0.9.30/avr32 diff --git a/toolchain/uClibc/config/0.9.30/cris b/toolchain/uClibc/config-0.9.30/cris similarity index 100% rename from toolchain/uClibc/config/0.9.30/cris rename to toolchain/uClibc/config-0.9.30/cris diff --git a/toolchain/uClibc/config/0.9.30/i386 b/toolchain/uClibc/config-0.9.30/i386 similarity index 100% rename from toolchain/uClibc/config/0.9.30/i386 rename to toolchain/uClibc/config-0.9.30/i386 diff --git a/toolchain/uClibc/config/0.9.30/i686 b/toolchain/uClibc/config-0.9.30/i686 similarity index 100% rename from toolchain/uClibc/config/0.9.30/i686 rename to toolchain/uClibc/config-0.9.30/i686 diff --git a/toolchain/uClibc/config/0.9.30/mips b/toolchain/uClibc/config-0.9.30/mips similarity index 100% rename from toolchain/uClibc/config/0.9.30/mips rename to toolchain/uClibc/config-0.9.30/mips diff --git a/toolchain/uClibc/config/0.9.30/mipsel b/toolchain/uClibc/config-0.9.30/mipsel similarity index 100% rename from toolchain/uClibc/config/0.9.30/mipsel rename to toolchain/uClibc/config-0.9.30/mipsel diff --git a/toolchain/uClibc/config/0.9.30/powerpc b/toolchain/uClibc/config-0.9.30/powerpc similarity index 100% rename from toolchain/uClibc/config/0.9.30/powerpc rename to toolchain/uClibc/config-0.9.30/powerpc diff --git a/toolchain/uClibc/config/0.9.30/x86_64 b/toolchain/uClibc/config-0.9.30/x86_64 similarity index 100% rename from toolchain/uClibc/config/0.9.30/x86_64 rename to toolchain/uClibc/config-0.9.30/x86_64 diff --git a/toolchain/uClibc/patches/0.9.28.2/100-revert_broken_stuff.patch b/toolchain/uClibc/patches-0.9.28/100-revert_broken_stuff.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/100-revert_broken_stuff.patch rename to toolchain/uClibc/patches-0.9.28/100-revert_broken_stuff.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/120-more_standard_math.patch b/toolchain/uClibc/patches-0.9.28/120-more_standard_math.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/120-more_standard_math.patch rename to toolchain/uClibc/patches-0.9.28/120-more_standard_math.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/150-portability.patch b/toolchain/uClibc/patches-0.9.28/150-portability.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/150-portability.patch rename to toolchain/uClibc/patches-0.9.28/150-portability.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/160-move_stack_end.patch b/toolchain/uClibc/patches-0.9.28/160-move_stack_end.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/160-move_stack_end.patch rename to toolchain/uClibc/patches-0.9.28/160-move_stack_end.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/180-fix_kernel_types_with_recent_kernel.patch b/toolchain/uClibc/patches-0.9.28/180-fix_kernel_types_with_recent_kernel.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/180-fix_kernel_types_with_recent_kernel.patch rename to toolchain/uClibc/patches-0.9.28/180-fix_kernel_types_with_recent_kernel.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/200-cris-syscall6.patch b/toolchain/uClibc/patches-0.9.28/200-cris-syscall6.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/200-cris-syscall6.patch rename to toolchain/uClibc/patches-0.9.28/200-cris-syscall6.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/230-cris-pagesize.patch b/toolchain/uClibc/patches-0.9.28/230-cris-pagesize.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/230-cris-pagesize.patch rename to toolchain/uClibc/patches-0.9.28/230-cris-pagesize.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/240-cris-crt0.patch b/toolchain/uClibc/patches-0.9.28/240-cris-crt0.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/240-cris-crt0.patch rename to toolchain/uClibc/patches-0.9.28/240-cris-crt0.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/250-cris-errno.patch b/toolchain/uClibc/patches-0.9.28/250-cris-errno.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/250-cris-errno.patch rename to toolchain/uClibc/patches-0.9.28/250-cris-errno.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/300-let-optimized-stringops-override-default-ones.patch b/toolchain/uClibc/patches-0.9.28/300-let-optimized-stringops-override-default-ones.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/300-let-optimized-stringops-override-default-ones.patch rename to toolchain/uClibc/patches-0.9.28/300-let-optimized-stringops-override-default-ones.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/301-fix-getrusage-argument-type.patch b/toolchain/uClibc/patches-0.9.28/301-fix-getrusage-argument-type.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/301-fix-getrusage-argument-type.patch rename to toolchain/uClibc/patches-0.9.28/301-fix-getrusage-argument-type.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/302-fix-__libc_fcntl64-varargs-prototype.patch b/toolchain/uClibc/patches-0.9.28/302-fix-__libc_fcntl64-varargs-prototype.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/302-fix-__libc_fcntl64-varargs-prototype.patch rename to toolchain/uClibc/patches-0.9.28/302-fix-__libc_fcntl64-varargs-prototype.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/303-fix-broken-__libc_open-declaration.patch b/toolchain/uClibc/patches-0.9.28/303-fix-broken-__libc_open-declaration.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/303-fix-broken-__libc_open-declaration.patch rename to toolchain/uClibc/patches-0.9.28/303-fix-broken-__libc_open-declaration.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/400-avr32-arch-2.patch b/toolchain/uClibc/patches-0.9.28/400-avr32-arch-2.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/400-avr32-arch-2.patch rename to toolchain/uClibc/patches-0.9.28/400-avr32-arch-2.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/401-avr32-linkrelax-option.patch b/toolchain/uClibc/patches-0.9.28/401-avr32-linkrelax-option.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/401-avr32-linkrelax-option.patch rename to toolchain/uClibc/patches-0.9.28/401-avr32-linkrelax-option.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/402-avr32-string-ops.patch b/toolchain/uClibc/patches-0.9.28/402-avr32-string-ops.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/402-avr32-string-ops.patch rename to toolchain/uClibc/patches-0.9.28/402-avr32-string-ops.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/403-no-create_module-on-avr32.patch b/toolchain/uClibc/patches-0.9.28/403-no-create_module-on-avr32.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/403-no-create_module-on-avr32.patch rename to toolchain/uClibc/patches-0.9.28/403-no-create_module-on-avr32.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/407-ldso-avr32-2.patch b/toolchain/uClibc/patches-0.9.28/407-ldso-avr32-2.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/407-ldso-avr32-2.patch rename to toolchain/uClibc/patches-0.9.28/407-ldso-avr32-2.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/409-ldso-avr32-startup-hack.patch b/toolchain/uClibc/patches-0.9.28/409-ldso-avr32-startup-hack.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/409-ldso-avr32-startup-hack.patch rename to toolchain/uClibc/patches-0.9.28/409-ldso-avr32-startup-hack.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/410-ldd-avr32-support.patch b/toolchain/uClibc/patches-0.9.28/410-ldd-avr32-support.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/410-ldd-avr32-support.patch rename to toolchain/uClibc/patches-0.9.28/410-ldd-avr32-support.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/411-libpthread-avr32.patch b/toolchain/uClibc/patches-0.9.28/411-libpthread-avr32.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/411-libpthread-avr32.patch rename to toolchain/uClibc/patches-0.9.28/411-libpthread-avr32.patch diff --git a/toolchain/uClibc/patches/0.9.28.2/412-sync-fcntl-h-with-linux-kernel.patch b/toolchain/uClibc/patches-0.9.28/412-sync-fcntl-h-with-linux-kernel.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.28.2/412-sync-fcntl-h-with-linux-kernel.patch rename to toolchain/uClibc/patches-0.9.28/412-sync-fcntl-h-with-linux-kernel.patch diff --git a/toolchain/uClibc/patches/001-fix_mmap.patch b/toolchain/uClibc/patches-0.9.29/001-fix_mmap.patch similarity index 100% rename from toolchain/uClibc/patches/001-fix_mmap.patch rename to toolchain/uClibc/patches-0.9.29/001-fix_mmap.patch diff --git a/toolchain/uClibc/patches/002-conditional_sched_affinity.patch b/toolchain/uClibc/patches-0.9.29/002-conditional_sched_affinity.patch similarity index 100% rename from toolchain/uClibc/patches/002-conditional_sched_affinity.patch rename to toolchain/uClibc/patches-0.9.29/002-conditional_sched_affinity.patch diff --git a/toolchain/uClibc/patches/004-fix_gethostent_r_failure_retval.patch b/toolchain/uClibc/patches-0.9.29/004-fix_gethostent_r_failure_retval.patch similarity index 100% rename from toolchain/uClibc/patches/004-fix_gethostent_r_failure_retval.patch rename to toolchain/uClibc/patches-0.9.29/004-fix_gethostent_r_failure_retval.patch diff --git a/toolchain/uClibc/patches/005-fix_internal_function_definition.patch b/toolchain/uClibc/patches-0.9.29/005-fix_internal_function_definition.patch similarity index 100% rename from toolchain/uClibc/patches/005-fix_internal_function_definition.patch rename to toolchain/uClibc/patches-0.9.29/005-fix_internal_function_definition.patch diff --git a/toolchain/uClibc/patches/006-rm_whitespace.patch b/toolchain/uClibc/patches-0.9.29/006-rm_whitespace.patch similarity index 100% rename from toolchain/uClibc/patches/006-rm_whitespace.patch rename to toolchain/uClibc/patches-0.9.29/006-rm_whitespace.patch diff --git a/toolchain/uClibc/patches/007-avr32.patch b/toolchain/uClibc/patches-0.9.29/007-avr32.patch similarity index 100% rename from toolchain/uClibc/patches/007-avr32.patch rename to toolchain/uClibc/patches-0.9.29/007-avr32.patch diff --git a/toolchain/uClibc/patches/008-avr32_fix_sa_onstack.patch b/toolchain/uClibc/patches-0.9.29/008-avr32_fix_sa_onstack.patch similarity index 100% rename from toolchain/uClibc/patches/008-avr32_fix_sa_onstack.patch rename to toolchain/uClibc/patches-0.9.29/008-avr32_fix_sa_onstack.patch diff --git a/toolchain/uClibc/patches/009-fix_getaddrinfo_infinite_loop.patch b/toolchain/uClibc/patches-0.9.29/009-fix_getaddrinfo_infinite_loop.patch similarity index 100% rename from toolchain/uClibc/patches/009-fix_getaddrinfo_infinite_loop.patch rename to toolchain/uClibc/patches-0.9.29/009-fix_getaddrinfo_infinite_loop.patch diff --git a/toolchain/uClibc/patches/100-termios.patch b/toolchain/uClibc/patches-0.9.29/100-termios.patch similarity index 100% rename from toolchain/uClibc/patches/100-termios.patch rename to toolchain/uClibc/patches-0.9.29/100-termios.patch diff --git a/toolchain/uClibc/patches/110-compat_macros.patch b/toolchain/uClibc/patches-0.9.29/110-compat_macros.patch similarity index 100% rename from toolchain/uClibc/patches/110-compat_macros.patch rename to toolchain/uClibc/patches-0.9.29/110-compat_macros.patch diff --git a/toolchain/uClibc/patches/120-adjtimex.patch b/toolchain/uClibc/patches-0.9.29/120-adjtimex.patch similarity index 100% rename from toolchain/uClibc/patches/120-adjtimex.patch rename to toolchain/uClibc/patches-0.9.29/120-adjtimex.patch diff --git a/toolchain/uClibc/patches/130-compile_fixes.patch b/toolchain/uClibc/patches-0.9.29/130-compile_fixes.patch similarity index 100% rename from toolchain/uClibc/patches/130-compile_fixes.patch rename to toolchain/uClibc/patches-0.9.29/130-compile_fixes.patch diff --git a/toolchain/uClibc/patches/130-sockets_throw.patch b/toolchain/uClibc/patches-0.9.29/130-sockets_throw.patch similarity index 100% rename from toolchain/uClibc/patches/130-sockets_throw.patch rename to toolchain/uClibc/patches-0.9.29/130-sockets_throw.patch diff --git a/toolchain/uClibc/patches/131-arm_ftruncate64.patch b/toolchain/uClibc/patches-0.9.29/131-arm_ftruncate64.patch similarity index 100% rename from toolchain/uClibc/patches/131-arm_ftruncate64.patch rename to toolchain/uClibc/patches-0.9.29/131-arm_ftruncate64.patch diff --git a/toolchain/uClibc/patches/132-arm_fix_alignment.patch b/toolchain/uClibc/patches-0.9.29/132-arm_fix_alignment.patch similarity index 100% rename from toolchain/uClibc/patches/132-arm_fix_alignment.patch rename to toolchain/uClibc/patches-0.9.29/132-arm_fix_alignment.patch diff --git a/toolchain/uClibc/patches/133-unistd_arm.patch b/toolchain/uClibc/patches-0.9.29/133-unistd_arm.patch similarity index 100% rename from toolchain/uClibc/patches/133-unistd_arm.patch rename to toolchain/uClibc/patches-0.9.29/133-unistd_arm.patch diff --git a/toolchain/uClibc/patches/140-fix-endless-recursion-in-pthread.patch b/toolchain/uClibc/patches-0.9.29/140-fix-endless-recursion-in-pthread.patch similarity index 100% rename from toolchain/uClibc/patches/140-fix-endless-recursion-in-pthread.patch rename to toolchain/uClibc/patches-0.9.29/140-fix-endless-recursion-in-pthread.patch diff --git a/toolchain/uClibc/patches/150-fix-ldso-text-realloc-segfault.patch b/toolchain/uClibc/patches-0.9.29/150-fix-ldso-text-realloc-segfault.patch similarity index 100% rename from toolchain/uClibc/patches/150-fix-ldso-text-realloc-segfault.patch rename to toolchain/uClibc/patches-0.9.29/150-fix-ldso-text-realloc-segfault.patch diff --git a/toolchain/uClibc/patches/160-mips_syscall.patch b/toolchain/uClibc/patches-0.9.29/160-mips_syscall.patch similarity index 100% rename from toolchain/uClibc/patches/160-mips_syscall.patch rename to toolchain/uClibc/patches-0.9.29/160-mips_syscall.patch diff --git a/toolchain/uClibc/patches/170-enable-getifaddrs.patch b/toolchain/uClibc/patches-0.9.29/170-enable-getifaddrs.patch similarity index 100% rename from toolchain/uClibc/patches/170-enable-getifaddrs.patch rename to toolchain/uClibc/patches-0.9.29/170-enable-getifaddrs.patch diff --git a/toolchain/uClibc/patches/180-fix_kernel_types_with_recent_kernel.patch b/toolchain/uClibc/patches-0.9.29/180-fix_kernel_types_with_recent_kernel.patch similarity index 100% rename from toolchain/uClibc/patches/180-fix_kernel_types_with_recent_kernel.patch rename to toolchain/uClibc/patches-0.9.29/180-fix_kernel_types_with_recent_kernel.patch diff --git a/toolchain/uClibc/patches/190-install_tls.patch b/toolchain/uClibc/patches-0.9.29/190-install_tls.patch similarity index 100% rename from toolchain/uClibc/patches/190-install_tls.patch rename to toolchain/uClibc/patches-0.9.29/190-install_tls.patch diff --git a/toolchain/uClibc/patches/200-libpthread_fix.patch b/toolchain/uClibc/patches-0.9.29/200-libpthread_fix.patch similarity index 100% rename from toolchain/uClibc/patches/200-libpthread_fix.patch rename to toolchain/uClibc/patches-0.9.29/200-libpthread_fix.patch diff --git a/toolchain/uClibc/patches/210-trunc.patch b/toolchain/uClibc/patches-0.9.29/210-trunc.patch similarity index 100% rename from toolchain/uClibc/patches/210-trunc.patch rename to toolchain/uClibc/patches-0.9.29/210-trunc.patch diff --git a/toolchain/uClibc/patches/220-libpthread_sysdep_fixes.patch b/toolchain/uClibc/patches-0.9.29/220-libpthread_sysdep_fixes.patch similarity index 100% rename from toolchain/uClibc/patches/220-libpthread_sysdep_fixes.patch rename to toolchain/uClibc/patches-0.9.29/220-libpthread_sysdep_fixes.patch diff --git a/toolchain/uClibc/patches/910-gcc_4_3_include_fixed.patch b/toolchain/uClibc/patches-0.9.29/910-gcc_4_3_include_fixed.patch similarity index 100% rename from toolchain/uClibc/patches/910-gcc_4_3_include_fixed.patch rename to toolchain/uClibc/patches-0.9.29/910-gcc_4_3_include_fixed.patch diff --git a/toolchain/uClibc/patches/0.9.30/110-compat_macros.patch b/toolchain/uClibc/patches-0.9.30/110-compat_macros.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.30/110-compat_macros.patch rename to toolchain/uClibc/patches-0.9.30/110-compat_macros.patch diff --git a/toolchain/uClibc/patches/0.9.30/120-adjtimex.patch b/toolchain/uClibc/patches-0.9.30/120-adjtimex.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.30/120-adjtimex.patch rename to toolchain/uClibc/patches-0.9.30/120-adjtimex.patch diff --git a/toolchain/uClibc/patches/0.9.30/130-sockets_throw.patch b/toolchain/uClibc/patches-0.9.30/130-sockets_throw.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.30/130-sockets_throw.patch rename to toolchain/uClibc/patches-0.9.30/130-sockets_throw.patch diff --git a/toolchain/uClibc/patches/0.9.30/180-fix_kernel_types_with_recent_kernel.patch b/toolchain/uClibc/patches-0.9.30/180-fix_kernel_types_with_recent_kernel.patch similarity index 100% rename from toolchain/uClibc/patches/0.9.30/180-fix_kernel_types_with_recent_kernel.patch rename to toolchain/uClibc/patches-0.9.30/180-fix_kernel_types_with_recent_kernel.patch