- apply the patches

diff --git a/package/mdadm/mdadm-2.6.1-001.uclibc-and-ftw-fixup.patch b/package/mdadm/mdadm-2.6.1-001.uclibc-and-ftw-fixup.patch
index 9269e383c6e9fab0fd84d99444656828753f36e4..cabf62e88bc7da4bd781df19173a294cd91a364b 100644 (file)
--- a/package/mdadm/mdadm-2.6.1-001.uclibc-and-ftw-fixup.patch
+++ b/package/mdadm/mdadm-2.6.1-001.uclibc-and-ftw-fixup.patch
@@ -10,15 +10,4 @@ diff -rdup mdadm-2.6.1.orig/mdadm.h mdadm-2.6.1/mdadm.h
  # include <features.h>
  # ifndef  __UCLIBC_HAS_FTW__
  #  undef HAVE_FTW
-diff -rdup mdadm-2.6.1.orig/util.c mdadm-2.6.1/util.c
---- mdadm-2.6.1.orig/util.c    2006-12-19 03:35:27.000000000 +0100
-+++ mdadm-2.6.1/util.c 2007-04-16 21:05:56.000000000 +0200
-@@ -468,7 +468,7 @@ int nftw(const char *path, int (*han)(co
-       return ftw(path, add_dev_1, nopenfd);
- }
- #else
--int add_dev(const char *name, const struct stat *stb, int flag, struct FTW *s)
-+int add_dev_1(const char *name, const struct stat *stb, int flag, struct FTW *s)
- {
-       return 0;
- }
+

diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index cc6579dad61b3f2eb9a633a62edcacc3a4b0e13c..08df50e53ffb79066d0c2ceeb3033f18f211fc5c 100644 (file)
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -30,7 +30,8 @@ ifneq ($(MDADM_PATCH),)
          toolchain/patch-kernel.sh $(MDADM_DIR) $(MDADM_DIR)/debian/patches \*patch ; \
        fi
 endif
-       toolchain/patch-kernel.sh $(MDADM_DIR) package/mdadm mdadm-$(MDADM_VERSION)\*.patch
+       #toolchain/patch-kernel.sh $(MDADM_DIR) package/mdadm mdadm-$(MDADM_VERSION)\*.patch
+       toolchain/patch-kernel.sh $(MDADM_DIR) package/mdadm mdadm-\*.patch
        touch $@
 
 $(MDADM_DIR)/$(MDADM_BINARY): $(MDADM_DIR)/.unpacked