* [Buildroot] svn commit: trunk/buildroot/package/mdadm
@ 2007-04-16 19:08 aldot at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: aldot at uclibc.org @ 2007-04-16 19:08 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-04-16 12:08:27 -0700 (Mon, 16 Apr 2007)
New Revision: 18458
Log:
- doesn't build, so bump version and look..
Modified:
trunk/buildroot/package/mdadm/mdadm.mk
Changeset:
Modified: trunk/buildroot/package/mdadm/mdadm.mk
===================================================================
--- trunk/buildroot/package/mdadm/mdadm.mk 2007-04-16 18:51:20 UTC (rev 18457)
+++ trunk/buildroot/package/mdadm/mdadm.mk 2007-04-16 19:08:27 UTC (rev 18458)
@@ -3,7 +3,7 @@
# mdadm
#
#############################################################
-MDADM_VERSION:=2.4.1
+MDADM_VERSION:=2.6.1
MDADM_SOURCE:=mdadm-$(MDADM_VERSION).tar.bz2
MDADM_CAT:=$(BZCAT)
MDADM_SITE:=http://www.kernel.org/pub/linux/utils/raid/mdadm
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mdadm
@ 2007-04-16 19:14 aldot at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: aldot at uclibc.org @ 2007-04-16 19:14 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-04-16 12:14:34 -0700 (Mon, 16 Apr 2007)
New Revision: 18459
Log:
- uclibc is nowadays identified via __UCLIBC__
- fix build error when no ftw() is available.
Added:
trunk/buildroot/package/mdadm/mdadm-2.6.1-001.uclibc-and-ftw-fixup.patch
Changeset:
Added: trunk/buildroot/package/mdadm/mdadm-2.6.1-001.uclibc-and-ftw-fixup.patch
===================================================================
--- trunk/buildroot/package/mdadm/mdadm-2.6.1-001.uclibc-and-ftw-fixup.patch (rev 0)
+++ trunk/buildroot/package/mdadm/mdadm-2.6.1-001.uclibc-and-ftw-fixup.patch 2007-04-16 19:14:34 UTC (rev 18459)
@@ -0,0 +1,24 @@
+diff -rdup mdadm-2.6.1.orig/mdadm.h mdadm-2.6.1/mdadm.h
+--- mdadm-2.6.1.orig/mdadm.h 2007-02-22 04:59:28.000000000 +0100
++++ mdadm-2.6.1/mdadm.h 2007-04-16 20:53:53.000000000 +0200
+@@ -382,7 +382,7 @@ struct stat64;
+ #define HAVE_NFTW we assume
+ #define HAVE_FTW
+
+-#ifdef UCLIBC
++#if defined __UCLIBC__ || /* older did use that? */ defined UCLIBC
+ # 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;
+ }
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/mdadm
@ 2007-04-17 15:48 aldot at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: aldot at uclibc.org @ 2007-04-17 15:48 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-04-17 08:48:09 -0700 (Tue, 17 Apr 2007)
New Revision: 18476
Log:
- make it compile if LFS was turned off
Added:
trunk/buildroot/package/mdadm/mdadm-2.6.1-002.uclibc-not-lfs-fixup.patch
Changeset:
Added: trunk/buildroot/package/mdadm/mdadm-2.6.1-002.uclibc-not-lfs-fixup.patch
===================================================================
--- trunk/buildroot/package/mdadm/mdadm-2.6.1-002.uclibc-not-lfs-fixup.patch (rev 0)
+++ trunk/buildroot/package/mdadm/mdadm-2.6.1-002.uclibc-not-lfs-fixup.patch 2007-04-17 15:48:09 UTC (rev 18476)
@@ -0,0 +1,13 @@
+diff -rdup mdadm-2.6.1-001/mdadm.h mdadm-2.6.1/mdadm.h
+--- mdadm-2.6.1-001/mdadm.h 2007-04-17 17:41:04.000000000 +0200
++++ mdadm-2.6.1/mdadm.h 2007-04-17 17:38:43.000000000 +0200
+@@ -388,6 +388,9 @@ struct stat64;
+ # undef HAVE_FTW
+ # undef HAVE_NFTW
+ # endif
++# ifndef __UCLIBC_HAS_LFS__
++# define lseek64 lseek
++# endif
+ #endif
+
+ #ifdef __dietlibc__
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mdadm
@ 2007-04-18 19:55 aldot at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: aldot at uclibc.org @ 2007-04-18 19:55 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-04-18 12:55:14 -0700 (Wed, 18 Apr 2007)
New Revision: 18488
Log:
- it helps to apply the patches.. ;)
- mdadm-clean tried to uninstall mdadm from the host, which may not be what was intended in the end
Modified:
trunk/buildroot/package/mdadm/mdadm.mk
Changeset:
Modified: trunk/buildroot/package/mdadm/mdadm.mk
===================================================================
--- trunk/buildroot/package/mdadm/mdadm.mk 2007-04-18 19:54:26 UTC (rev 18487)
+++ trunk/buildroot/package/mdadm/mdadm.mk 2007-04-18 19:55:14 UTC (rev 18488)
@@ -14,23 +14,25 @@
$(DL_DIR)/$(MDADM_SOURCE):
$(WGET) -P $(DL_DIR) $(MDADM_SITE)/$(MDADM_SOURCE)
-$(MDADM_DIR)/.source: $(DL_DIR)/$(MDADM_SOURCE)
+$(MDADM_DIR)/.unpacked: $(DL_DIR)/$(MDADM_SOURCE)
$(MDADM_CAT) $(DL_DIR)/$(MDADM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(MDADM_DIR)/.source
+ toolchain/patch-kernel.sh $(MDADM_DIR) package/mdadm mdadm-$(MDADM_VERSION)\*.patch
+ touch $@
-$(MDADM_DIR)/$(MDADM_BINARY): $(MDADM_DIR)/.source
+$(MDADM_DIR)/$(MDADM_BINARY): $(MDADM_DIR)/.unpacked
$(MAKE) CFLAGS="$(TARGET_CFLAGS)" CC=$(TARGET_CC) -C $(MDADM_DIR)
$(TARGET_DIR)/$(MDADM_TARGET_BINARY): $(MDADM_DIR)/$(MDADM_BINARY)
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(MDADM_DIR) install
rm -Rf $(TARGET_DIR)/usr/share/man
+ $(STRIP) -s $@
mdadm: uclibc $(TARGET_DIR)/$(MDADM_TARGET_BINARY)
mdadm-source: $(DL_DIR)/$(MDADM_SOURCE)
mdadm-clean:
- $(MAKE) prefix=$(TARGET_DIR)/usr -C $(MDADM_DIR) uninstall
+ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(MDADM_DIR) uninstall
-$(MAKE) -C $(MDADM_DIR) clean
mdadm-dirclean:
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mdadm
@ 2007-05-15 11:25 aldot at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: aldot at uclibc.org @ 2007-05-15 11:25 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-05-15 04:25:41 -0700 (Tue, 15 May 2007)
New Revision: 18623
Log:
- bump version
Modified:
trunk/buildroot/package/mdadm/mdadm.mk
Changeset:
Modified: trunk/buildroot/package/mdadm/mdadm.mk
===================================================================
--- trunk/buildroot/package/mdadm/mdadm.mk 2007-05-15 11:24:27 UTC (rev 18622)
+++ trunk/buildroot/package/mdadm/mdadm.mk 2007-05-15 11:25:41 UTC (rev 18623)
@@ -4,18 +4,32 @@
#
#############################################################
MDADM_VERSION:=2.6.1
-MDADM_SOURCE:=mdadm-$(MDADM_VERSION).tar.bz2
-MDADM_CAT:=$(BZCAT)
-MDADM_SITE:=http://www.kernel.org/pub/linux/utils/raid/mdadm
+MDADM_SOURCE:=mdadm_$(MDADM_VERSION).orig.tar.gz
+MDADM_PATCH:=mdadm_$(MDADM_VERSION)-1~exp.5.diff.gz
+MDADM_CAT:=$(ZCAT)
+MDADM_SITE:=http://ftp.debian.org/debian/pool/main/m/mdadm
MDADM_DIR:=$(BUILD_DIR)/mdadm-$(MDADM_VERSION)
MDADM_BINARY:=mdadm
MDADM_TARGET_BINARY:=sbin/mdadm
-$(DL_DIR)/$(MDADM_SOURCE):
+ifneq ($(MDADM_PATCH),)
+MDADM_PATCH_FILE:=$(DL_DIR)/$(MDADM_PATCH)
+$(MDADM_PATCH_FILE):
+ $(WGET) -P $(DL_DIR) $(MDADM_SITE)/$(MDADM_PATCH)
+endif
+
+$(DL_DIR)/$(MDADM_SOURCE): $(MDADM_PATCH_FILE)
$(WGET) -P $(DL_DIR) $(MDADM_SITE)/$(MDADM_SOURCE)
+ touch -c $@
$(MDADM_DIR)/.unpacked: $(DL_DIR)/$(MDADM_SOURCE)
$(MDADM_CAT) $(DL_DIR)/$(MDADM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ifneq ($(MDADM_PATCH),)
+ (cd $(MDADM_DIR) && $(MDADM_CAT) $(MDADM_PATCH_FILE) | patch -p1)
+ if [ -d $(MDADM_DIR)/debian/patches ]; then \
+ 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
touch $@
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mdadm
@ 2007-05-18 9:55 aldot at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: aldot at uclibc.org @ 2007-05-18 9:55 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-05-18 02:55:09 -0700 (Fri, 18 May 2007)
New Revision: 18650
Log:
- bump patch version
Modified:
trunk/buildroot/package/mdadm/mdadm.mk
Changeset:
Modified: trunk/buildroot/package/mdadm/mdadm.mk
===================================================================
--- trunk/buildroot/package/mdadm/mdadm.mk 2007-05-18 09:45:36 UTC (rev 18649)
+++ trunk/buildroot/package/mdadm/mdadm.mk 2007-05-18 09:55:09 UTC (rev 18650)
@@ -5,7 +5,7 @@
#############################################################
MDADM_VERSION:=2.6.1
MDADM_SOURCE:=mdadm_$(MDADM_VERSION).orig.tar.gz
-MDADM_PATCH:=mdadm_$(MDADM_VERSION)-1~exp.5.diff.gz
+MDADM_PATCH:=mdadm_$(MDADM_VERSION)-1.diff.gz
MDADM_CAT:=$(ZCAT)
MDADM_SITE:=http://ftp.debian.org/debian/pool/main/m/mdadm
MDADM_DIR:=$(BUILD_DIR)/mdadm-$(MDADM_VERSION)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mdadm
@ 2007-06-26 16:35 aldot at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: aldot at uclibc.org @ 2007-06-26 16:35 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-06-26 09:35:07 -0700 (Tue, 26 Jun 2007)
New Revision: 18944
Log:
- apply the patches
Modified:
trunk/buildroot/package/mdadm/mdadm-2.6.1-001.uclibc-and-ftw-fixup.patch
trunk/buildroot/package/mdadm/mdadm.mk
Changeset:
Modified: trunk/buildroot/package/mdadm/mdadm-2.6.1-001.uclibc-and-ftw-fixup.patch
===================================================================
--- trunk/buildroot/package/mdadm/mdadm-2.6.1-001.uclibc-and-ftw-fixup.patch 2007-06-26 16:34:45 UTC (rev 18943)
+++ trunk/buildroot/package/mdadm/mdadm-2.6.1-001.uclibc-and-ftw-fixup.patch 2007-06-26 16:35:07 UTC (rev 18944)
@@ -10,15 +10,4 @@
# 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;
- }
+
Modified: trunk/buildroot/package/mdadm/mdadm.mk
===================================================================
--- trunk/buildroot/package/mdadm/mdadm.mk 2007-06-26 16:34:45 UTC (rev 18943)
+++ trunk/buildroot/package/mdadm/mdadm.mk 2007-06-26 16:35:07 UTC (rev 18944)
@@ -30,7 +30,8 @@
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
^ permalink raw reply [flat|nested] 10+ messages in thread* [Buildroot] svn commit: trunk/buildroot/package/mdadm
@ 2007-10-30 21:32 ulf at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: ulf at uclibc.org @ 2007-10-30 21:32 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-10-30 14:32:09 -0700 (Tue, 30 Oct 2007)
New Revision: 20338
Log:
Update mdadm patch to latest version
Modified:
trunk/buildroot/package/mdadm/mdadm.mk
Changeset:
Modified: trunk/buildroot/package/mdadm/mdadm.mk
===================================================================
--- trunk/buildroot/package/mdadm/mdadm.mk 2007-10-30 21:26:50 UTC (rev 20337)
+++ trunk/buildroot/package/mdadm/mdadm.mk 2007-10-30 21:32:09 UTC (rev 20338)
@@ -5,7 +5,7 @@
#############################################################
MDADM_VERSION:=2.6.2
MDADM_SOURCE:=mdadm_$(MDADM_VERSION).orig.tar.gz
-MDADM_PATCH:=mdadm_$(MDADM_VERSION)-1.diff.gz
+MDADM_PATCH:=mdadm_$(MDADM_VERSION)-2.diff.gz
MDADM_CAT:=$(ZCAT)
MDADM_SITE:=http://ftp.debian.org/debian/pool/main/m/mdadm
MDADM_DIR:=$(BUILD_DIR)/mdadm-$(MDADM_VERSION)
@@ -44,7 +44,7 @@
mdadm: uclibc $(TARGET_DIR)/$(MDADM_TARGET_BINARY)
-mdadm-source: $(DL_DIR)/$(MDADM_SOURCE)
+mdadm-source: $(DL_DIR)/$(MDADM_SOURCE) $(MDADM_PATCH_FILE)
mdadm-clean:
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(MDADM_DIR) uninstall
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mdadm
@ 2008-03-24 19:19 nkukard at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: nkukard at uclibc.org @ 2008-03-24 19:19 UTC (permalink / raw)
To: buildroot
Author: nkukard
Date: 2008-03-24 12:19:16 -0700 (Mon, 24 Mar 2008)
New Revision: 21474
Log:
* Updated mdadm to version 2.6.4
Modified:
trunk/buildroot/package/mdadm/mdadm.mk
Changeset:
Modified: trunk/buildroot/package/mdadm/mdadm.mk
===================================================================
--- trunk/buildroot/package/mdadm/mdadm.mk 2008-03-24 18:40:32 UTC (rev 21473)
+++ trunk/buildroot/package/mdadm/mdadm.mk 2008-03-24 19:19:16 UTC (rev 21474)
@@ -3,9 +3,9 @@
# mdadm
#
#############################################################
-MDADM_VERSION:=2.6.2
+MDADM_VERSION:=2.6.4
MDADM_SOURCE:=mdadm_$(MDADM_VERSION).orig.tar.gz
-MDADM_PATCH:=mdadm_$(MDADM_VERSION)-2.diff.gz
+MDADM_PATCH:=mdadm_$(MDADM_VERSION)-1.diff.gz
MDADM_CAT:=$(ZCAT)
MDADM_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mdadm
MDADM_DIR:=$(BUILD_DIR)/mdadm-$(MDADM_VERSION)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/mdadm
@ 2008-05-11 6:43 ulf at uclibc.org
0 siblings, 0 replies; 10+ messages in thread
From: ulf at uclibc.org @ 2008-05-11 6:43 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2008-05-10 23:43:22 -0700 (Sat, 10 May 2008)
New Revision: 21964
Log:
Bump mdadm version
Modified:
trunk/buildroot/package/mdadm/mdadm.mk
Changeset:
Modified: trunk/buildroot/package/mdadm/mdadm.mk
===================================================================
--- trunk/buildroot/package/mdadm/mdadm.mk 2008-05-11 06:41:33 UTC (rev 21963)
+++ trunk/buildroot/package/mdadm/mdadm.mk 2008-05-11 06:43:22 UTC (rev 21964)
@@ -5,7 +5,7 @@
#############################################################
MDADM_VERSION:=2.6.4
MDADM_SOURCE:=mdadm_$(MDADM_VERSION).orig.tar.gz
-MDADM_PATCH:=mdadm_$(MDADM_VERSION)-1.diff.gz
+MDADM_PATCH:=mdadm_$(MDADM_VERSION)-2.diff.gz
MDADM_CAT:=$(ZCAT)
MDADM_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mdadm
MDADM_DIR:=$(BUILD_DIR)/mdadm-$(MDADM_VERSION)
@@ -42,10 +42,12 @@
rm -Rf $(TARGET_DIR)/usr/share/man
$(STRIPCMD) $(STRIP_STRIP_ALL) $@
+mdadm-source: $(DL_DIR)/$(MDADM_SOURCE) $(MDADM_PATCH_FILE)
+
+mdadm-unpacked: $(MDADM_DIR)/.unpacked
+
mdadm: uclibc $(TARGET_DIR)/$(MDADM_TARGET_BINARY)
-mdadm-source: $(DL_DIR)/$(MDADM_SOURCE) $(MDADM_PATCH_FILE)
-
mdadm-clean:
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(MDADM_DIR) uninstall
-$(MAKE) -C $(MDADM_DIR) clean
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2008-05-11 6:43 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-04-16 19:08 [Buildroot] svn commit: trunk/buildroot/package/mdadm aldot at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2007-04-16 19:14 aldot at uclibc.org
2007-04-17 15:48 aldot at uclibc.org
2007-04-18 19:55 aldot at uclibc.org
2007-05-15 11:25 aldot at uclibc.org
2007-05-18 9:55 aldot at uclibc.org
2007-06-26 16:35 aldot at uclibc.org
2007-10-30 21:32 ulf at uclibc.org
2008-03-24 19:19 nkukard at uclibc.org
2008-05-11 6:43 ulf at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox