From ea9ad1ba47ccf73b8ce33d05b5d192406f7c939f Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Mon, 25 Apr 2011 20:37:11 +0000 Subject: [PATCH] upgrade mdadm package SVN-Revision: 26755 --- utils/mdadm/Makefile | 13 ++++++-- utils/mdadm/patches/001-makefile-fixes.patch | 31 +++++++++----------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/utils/mdadm/Makefile b/utils/mdadm/Makefile index 418f9c9f2e..684f38da45 100644 --- a/utils/mdadm/Makefile +++ b/utils/mdadm/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2008-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mdadm -PKG_VERSION:=2.6.7.2 +PKG_VERSION:=3.2 PKG_RELEASE:=1 -PKG_MD5SUM:=e4badb4a8ded4344ba0fa785883955d8 PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MD5SUM:=4ac70ccead74f947bf5aa4d189a977a0 + +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -23,6 +25,11 @@ define Package/mdadm TITLE:=A tool for managing Soft RAID under Linux URL:=http://www.kernel.org/pub/linux/utils/raid/mdadm/ DEPENDS:=@!LINUX_2_4 + MAINTAINER:=Luka Perkov +endef + +define Package/at/description + A tool for managing Linux Software RAID arrays. endef define Build/Compile diff --git a/utils/mdadm/patches/001-makefile-fixes.patch b/utils/mdadm/patches/001-makefile-fixes.patch index 48b797a225..ecbe57f332 100644 --- a/utils/mdadm/patches/001-makefile-fixes.patch +++ b/utils/mdadm/patches/001-makefile-fixes.patch @@ -1,24 +1,21 @@ -Only in mdadm-2.6.7.2: .prepared_52c8003c1cfc25b1e96897208f1a6856 -Only in mdadm-2.6.7.2.orig/: .prepared_b70de0be5a277506820fdcd9a21e9deb -diff -ur mdadm-2.6.7.2.orig/Makefile mdadm-2.6.7.2/Makefile ---- mdadm-2.6.7.2.orig/Makefile 2008-11-21 18:21:35.000000000 +0100 -+++ mdadm-2.6.7.2/Makefile 2008-11-21 19:13:54.000000000 +0100 -@@ -52,7 +52,7 @@ - CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf - MAILCMD =/usr/sbin/sendmail -t - CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\" --CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) -+#CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) +Index: mdadm-3.2/Makefile +=================================================================== +--- mdadm-3.2.orig/Makefile ++++ mdadm-3.2/Makefile +@@ -76,7 +76,6 @@ FAILED_SLOTS_DIR = /dev/.mdadm/failed-sl + DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\" + DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\" + DIRFLAGS += -DFAILED_SLOTS_DIR=\"$(FAILED_SLOTS_DIR)\" +-CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS) - # If you want a static binary, you might uncomment these - # LDFLAGS = -static -@@ -124,7 +124,7 @@ + # The glibc TLS ABI requires applications that call clone(2) to set up + # TLS data structures, use pthreads until mdmon implements this support +@@ -184,7 +183,7 @@ test_stripe : restripe.c mdadm.h - mdassemble : $(ASSEMBLE_SRCS) mdadm.h + mdassemble : $(ASSEMBLE_SRCS) $(INCL) rm -f $(OBJS) - $(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC) + $(CC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC) - mdassemble.static : $(ASSEMBLE_SRCS) mdadm.h + mdassemble.static : $(ASSEMBLE_SRCS) $(INCL) rm -f $(OBJS) -Only in mdadm-2.6.7.2: mdadm -- 2.30.2