From 13db6302c4ba0d270f95baaef2ebc97028de2d84 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 24 Apr 2008 09:03:12 +0000 Subject: [PATCH] uClibc: use .patch.$ARCH naming convention --- ...9.28.3-avr32.patch => uClibc-0.9.28.3-arch.patch.avr32} | 0 ...-ops.patch => uClibc-0.9.28.3-string-ops.patch.powerpc} | 0 ...29-002-atmel.1.patch => uClibc-0.9.29-arch.patch.avr32} | 0 ...tack.patch => uClibc-0.9.29-fix-sa_onstack.patch.avr32} | 0 toolchain/uClibc/uclibc.mk | 7 +++++-- 5 files changed, 5 insertions(+), 2 deletions(-) rename toolchain/uClibc/{uClibc-0.9.28.3-avr32.patch => uClibc-0.9.28.3-arch.patch.avr32} (100%) rename toolchain/uClibc/{uClibc-0.9.28.3-ppc-string-ops.patch => uClibc-0.9.28.3-string-ops.patch.powerpc} (100%) rename toolchain/uClibc/{uClibc-0.9.29-002-atmel.1.patch => uClibc-0.9.29-arch.patch.avr32} (100%) rename toolchain/uClibc/{uClibc-0.9.29-avr32-fix-sa_onstack.patch => uClibc-0.9.29-fix-sa_onstack.patch.avr32} (100%) diff --git a/toolchain/uClibc/uClibc-0.9.28.3-avr32.patch b/toolchain/uClibc/uClibc-0.9.28.3-arch.patch.avr32 similarity index 100% rename from toolchain/uClibc/uClibc-0.9.28.3-avr32.patch rename to toolchain/uClibc/uClibc-0.9.28.3-arch.patch.avr32 diff --git a/toolchain/uClibc/uClibc-0.9.28.3-ppc-string-ops.patch b/toolchain/uClibc/uClibc-0.9.28.3-string-ops.patch.powerpc similarity index 100% rename from toolchain/uClibc/uClibc-0.9.28.3-ppc-string-ops.patch rename to toolchain/uClibc/uClibc-0.9.28.3-string-ops.patch.powerpc diff --git a/toolchain/uClibc/uClibc-0.9.29-002-atmel.1.patch b/toolchain/uClibc/uClibc-0.9.29-arch.patch.avr32 similarity index 100% rename from toolchain/uClibc/uClibc-0.9.29-002-atmel.1.patch rename to toolchain/uClibc/uClibc-0.9.29-arch.patch.avr32 diff --git a/toolchain/uClibc/uClibc-0.9.29-avr32-fix-sa_onstack.patch b/toolchain/uClibc/uClibc-0.9.29-fix-sa_onstack.patch.avr32 similarity index 100% rename from toolchain/uClibc/uClibc-0.9.29-avr32-fix-sa_onstack.patch rename to toolchain/uClibc/uClibc-0.9.29-fix-sa_onstack.patch.avr32 diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index efbc3823d8..0a25315a09 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -113,9 +113,12 @@ $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA) rm -rf $(UCLIBC_DIR) $(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - ifneq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y) - toolchain/patch-kernel.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) uClibc-$(UCLIBC_OFFICIAL_VERSION)-\*.patch + toolchain/patch-kernel.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \ + uClibc-$(UCLIBC_OFFICIAL_VERSION)-\*.patch \ + uClibc-$(UCLIBC_OFFICIAL_VERSION)-\*.patch.$(ARCH) else - toolchain/patch-kernel.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) uClibc.\*.patch + toolchain/patch-kernel.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \ + uClibc.\*.patch uClibc.\*.patch.$(ARCH) endif ifneq ($(BR2_ENABLE_LOCALE),) cp -dpf $(DL_DIR)/$(UCLIBC_SOURCE_LOCALE) $(UCLIBC_DIR)/extra/locale/ -- 2.30.2