From 5dd91e234e32bca04fb4bf0384fb14b556e64b1a Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 26 Jun 2007 16:35:07 +0000 Subject: [PATCH] - apply the patches --- .../mdadm-2.6.1-001.uclibc-and-ftw-fixup.patch | 13 +------------ package/mdadm/mdadm.mk | 3 ++- 2 files changed, 3 insertions(+), 13 deletions(-) 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 9269e383c6..cabf62e88b 100644 --- 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 # 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 cc6579dad6..08df50e53f 100644 --- 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 -- 2.30.2